From b74708136410204e3d5e87ee09f360183049fdcd Mon Sep 17 00:00:00 2001 From: Nathan Voxland Date: Wed, 5 Jan 2022 12:20:23 -0600 Subject: [PATCH 1/3] Added additional unicode letter points --- .../main/javacc/liquibase/util/grammar/SimpleSqlGrammar.jj | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/liquibase-core/src/main/javacc/liquibase/util/grammar/SimpleSqlGrammar.jj b/liquibase-core/src/main/javacc/liquibase/util/grammar/SimpleSqlGrammar.jj index 792db79ec6c..f197789a998 100644 --- a/liquibase-core/src/main/javacc/liquibase/util/grammar/SimpleSqlGrammar.jj +++ b/liquibase-core/src/main/javacc/liquibase/util/grammar/SimpleSqlGrammar.jj @@ -392,11 +392,7 @@ Built list from http://stackoverflow.com/a/37668315/45756 "\u2DD0"-"\u2DD6", "\u2DD8"-"\u2DDE", "\u2E2F", - "\u3005", - "\u3006", - "\u3031"-"\u3035", - "\u303B", - "\u303C", + "\u3000"-"\u303f", "\u3041"-"\u3096", "\u309D"-"\u309F", "\u30A1"-"\u30FA", @@ -483,6 +479,7 @@ Built list from http://stackoverflow.com/a/37668315/45756 "\uFDF0"-"\uFDFB", "\uFE70"-"\uFE74", "\uFE76"-"\uFEFC", + "\uFF00"-"\uFFEF", "\uFF21"-"\uFF3A", "\uFF41"-"\uFF5A", "\uFF66"-"\uFFBE", From 3dd0faf803cbb96ce5e57edca34436b3084a0248 Mon Sep 17 00:00:00 2001 From: Nathan Voxland Date: Mon, 7 Feb 2022 12:14:03 -0600 Subject: [PATCH 2/3] Merged from master --- .../src/main/javacc/liquibase/util/grammar/SimpleSqlGrammar.jj | 1 - 1 file changed, 1 deletion(-) diff --git a/liquibase-core/src/main/javacc/liquibase/util/grammar/SimpleSqlGrammar.jj b/liquibase-core/src/main/javacc/liquibase/util/grammar/SimpleSqlGrammar.jj index 1c31eb5d72f..7c652f44465 100644 --- a/liquibase-core/src/main/javacc/liquibase/util/grammar/SimpleSqlGrammar.jj +++ b/liquibase-core/src/main/javacc/liquibase/util/grammar/SimpleSqlGrammar.jj @@ -498,7 +498,6 @@ TOKEN: /* symbols */ "["-"`", "{"-"~", - /* Built list from http://stackoverflow.com/a/37668315/45756 list of punctuation */ From 6388deb89ce075922600cd05f50f19a768e5d6e7 Mon Sep 17 00:00:00 2001 From: Nathan Voxland Date: Tue, 8 Feb 2022 10:30:48 -0600 Subject: [PATCH 3/3] Added UTF8 chars to test --- .../groovy/liquibase/util/grammar/SimpleSqlGrammarTest.groovy | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/liquibase-core/src/test/groovy/liquibase/util/grammar/SimpleSqlGrammarTest.groovy b/liquibase-core/src/test/groovy/liquibase/util/grammar/SimpleSqlGrammarTest.groovy index a96c5d2db5b..235d71046c3 100644 --- a/liquibase-core/src/test/groovy/liquibase/util/grammar/SimpleSqlGrammarTest.groovy +++ b/liquibase-core/src/test/groovy/liquibase/util/grammar/SimpleSqlGrammarTest.groovy @@ -31,7 +31,6 @@ class SimpleSqlGrammarTest extends Specification { "create table /* comment here */ test" | ["create", " ", "table", " ", "/* comment here */", " ", "test"] "insert 'a string'" | ["insert", " ", "'a string'"] "invalid ' sql" | ["invalid", " ", "'", " ", "sql"] - - + "utf8-〠＠chars works" | ["utf8", "-", "〠＠chars", " ", "works"] } }