apache#1674 bug fixs

codefairy08 · Mar 19, 2019 · 281ea48 · 281ea48
1 parent ea87434
commit 281ea48
Show file tree

Hide file tree

Showing 4 changed files with 96 additions and 28 deletions.
diff --git a/...e/sharding-core-parse/sharding-core-parse-mysql/src/main/antlr4/imports/mysql/DataType.g4 b/...e/sharding-core-parse/sharding-core-parse-mysql/src/main/antlr4/imports/mysql/DataType.g4
@@ -19,10 +19,27 @@ lexer grammar DataType;
 
 import Symbol, Alphabet;
 
-STRING_:       DQ_ ('\\"' | .)*? DQ_ | SQ_ (SQ_ | .)*? SQ_;
-NUMBER_:       MINUS_? INT_? DOT_? INT_ (E [+\-]? INT_)?;
-HEX_DIGIT_:    '0x' HEX_+ | 'X' SQ_ HEX_+ SQ_;
-BIT_NUM_:      '0b' ('0' | '1')+ | B SQ_ ('0' | '1')+ SQ_;
-
-fragment INT_: [0-9]+;
-fragment HEX_: [0-9a-fA-F];
+STRING_ 
+    : ('"' ( '\\'. | '""' | ~('"'| '\\') )* '"')
+    | ('\'' ('\\'. | '\'\'' | ~('\'' | '\\'))* '\'')
+    ;
+
+NUMBER_
+    : MINUS_? INT_? DOT_? INT_ (E [+\-]? INT_)?
+    ;
+
+HEX_DIGIT_
+    : '0x' HEX_+ | 'X' SQ_ HEX_+ SQ_
+    ;
+
+BIT_NUM_
+    : '0b' ('0' | '1')+ | B SQ_ ('0' | '1')+ SQ_
+    ;
+
+fragment INT_
+    : [0-9]+
+    ;
+
+fragment HEX_
+    : [0-9a-fA-F]
+    ;
diff --git a/...sharding-core-parse/sharding-core-parse-oracle/src/main/antlr4/imports/oracle/DataType.g4 b/...sharding-core-parse/sharding-core-parse-oracle/src/main/antlr4/imports/oracle/DataType.g4
@@ -19,10 +19,27 @@ lexer grammar DataType;
 
 import Symbol, Alphabet;
 
-STRING_:       DQ_ ('\\"' | .)*? DQ_ | SQ_ (SQ_ | .)*? SQ_;
-NUMBER_:       MINUS_? INT_? DOT_? INT_ (E [+\-]? INT_)?;
-HEX_DIGIT_:    '0x' HEX_+ | 'X' SQ_ HEX_+ SQ_;
-BIT_NUM_:      '0b' ('0' | '1')+ | B SQ_ ('0' | '1')+ SQ_;
-
-fragment INT_: [0-9]+;
-fragment HEX_: [0-9a-fA-F];
+STRING_ 
+    : ('"' ( '\\'. | '""' | ~('"'| '\\') )* '"')
+    | ('\'' ('\\'. | '\'\'' | ~('\'' | '\\'))* '\'')
+    ;
+
+NUMBER_
+    : MINUS_? INT_? DOT_? INT_ (E [+\-]? INT_)?
+    ;
+
+HEX_DIGIT_
+    : '0x' HEX_+ | 'X' SQ_ HEX_+ SQ_
+    ;
+
+BIT_NUM_
+    : '0b' ('0' | '1')+ | B SQ_ ('0' | '1')+ SQ_
+    ;
+
+fragment INT_
+    : [0-9]+
+    ;
+
+fragment HEX_
+    : [0-9a-fA-F]
+    ;
diff --git a/...-core-parse/sharding-core-parse-postgresql/src/main/antlr4/imports/postgresql/DataType.g4 b/...-core-parse/sharding-core-parse-postgresql/src/main/antlr4/imports/postgresql/DataType.g4
@@ -19,10 +19,27 @@ lexer grammar DataType;
 
 import Symbol, Alphabet;
 
-STRING_:       DQ_ ('\\"' | .)*? DQ_ | SQ_ (SQ_ | .)*? SQ_;
-NUMBER_:       MINUS_? INT_? DOT_? INT_ (E [+\-]? INT_)?;
-HEX_DIGIT_:    '0x' HEX_+ | 'X' SQ_ HEX_+ SQ_;
-BIT_NUM_:      '0b' ('0' | '1')+ | B SQ_ ('0' | '1')+ SQ_;
-
-fragment INT_: [0-9]+;
-fragment HEX_: [0-9a-fA-F];
+STRING_ 
+    : ('"' ( '\\'. | '""' | ~('"'| '\\') )* '"')
+    | ('\'' ('\\'. | '\'\'' | ~('\'' | '\\'))* '\'')
+    ;
+
+NUMBER_
+    : MINUS_? INT_? DOT_? INT_ (E [+\-]? INT_)?
+    ;
+
+HEX_DIGIT_
+    : '0x' HEX_+ | 'X' SQ_ HEX_+ SQ_
+    ;
+
+BIT_NUM_
+    : '0b' ('0' | '1')+ | B SQ_ ('0' | '1')+ SQ_
+    ;
+
+fragment INT_
+    : [0-9]+
+    ;
+
+fragment HEX_
+    : [0-9a-fA-F]
+    ;
diff --git a/...ng-core-parse/sharding-core-parse-sqlserver/src/main/antlr4/imports/sqlserver/DataType.g4 b/...ng-core-parse/sharding-core-parse-sqlserver/src/main/antlr4/imports/sqlserver/DataType.g4
@@ -19,10 +19,27 @@ lexer grammar DataType;
 
 import Symbol, Alphabet;
 
-STRING_:       DQ_ ('\\"' | .)*? DQ_ | SQ_ (SQ_ | .)*? SQ_;
-NUMBER_:       MINUS_? INT_? DOT_? INT_ (E [+\-]? INT_)?;
-HEX_DIGIT_:    '0x' HEX_+ | 'X' SQ_ HEX_+ SQ_;
-BIT_NUM_:      '0b' ('0' | '1')+ | B SQ_ ('0' | '1')+ SQ_;
-
-fragment INT_: [0-9]+;
-fragment HEX_: [0-9a-fA-F];
+STRING_ 
+    : ('"' ( '\\'. | '""' | ~('"'| '\\') )* '"')
+    | ('\'' ('\\'. | '\'\'' | ~('\'' | '\\'))* '\'')
+    ;
+
+NUMBER_
+    : MINUS_? INT_? DOT_? INT_ (E [+\-]? INT_)?
+    ;
+
+HEX_DIGIT_
+    : '0x' HEX_+ | 'X' SQ_ HEX_+ SQ_
+    ;
+
+BIT_NUM_
+    : '0b' ('0' | '1')+ | B SQ_ ('0' | '1')+ SQ_
+    ;
+
+fragment INT_
+    : [0-9]+
+    ;
+
+fragment HEX_
+    : [0-9a-fA-F]
+    ;