replace binary and varbinary types by varchar

martin-pabst · martin-pabst · commit a37f80db9e78 · 2022-10-22T10:19:34.000+02:00
diff --git a/src/client/compiler/parser/Parser.ts b/src/client/compiler/parser/Parser.ts
@@ -1274,6 +1274,8 @@ export class Parser {
         this.module.addCompletionHint(this.getEndOfPosition(pos0), pos1, hintColumns, hintTables, hints, null, praefix, suffix);
     }
 
+    identifierMap: {[key: string]:string} = {'year': 'int', 'binary': 'varchar', 'varbinary': 'varchar'};
+
     parseType(node: CreateTableColumnNode, primaryKeyAlreadyDefined: boolean) {
 
         let datatypes = SQLBaseType.baseTypes.map(type => type.toString());
@@ -1285,8 +1287,10 @@ export class Parser {
         }
 
         let identifier = <string>this.cct.value;
-        if (identifier.toLowerCase() == 'year') {
-            identifier = 'int';
+        let mappedIdentifier:string = this.identifierMap[identifier.toLocaleLowerCase()];
+
+        if (mappedIdentifier != null) {
+            identifier = mappedIdentifier;
         }
 
         let type = SQLBaseType.getBaseType(identifier);
@@ -1399,7 +1403,7 @@ export class Parser {
                     }
 
                     node.defaultValue = <string>this.cct.value;
-                    if (typeof this.cct.value == "string") {
+                    if (typeof this.cct.value == "string" && node.defaultValue.toLowerCase() != 'null' ) {
                         node.defaultValue = "'" + node.defaultValue + "'";
                     }
                     //@ts-ignore
@@ -1551,9 +1555,14 @@ export class Parser {
                 if (this.tt == TokenType.identifier) {
                     if (this.cct.isDoubleQuotedIdentifier) {
                         this.tt = TokenType.stringConstant
-                    } else if ((this.cct.value + "").toLocaleLowerCase() == "date") {
-                        this.nextToken();
+                    } else {
+                        let lv = (this.cct.value + "").toLocaleLowerCase();
+                        if (["date", "_binary"].indexOf(lv) >= 0) {
+                            this.nextToken();
+                        }
                     }
+                    
+                    
                 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -1274,6 +1274,8 @@ export class Parser {`
`1274`	`1274`	`this.module.addCompletionHint(this.getEndOfPosition(pos0), pos1, hintColumns, hintTables, hints, null, praefix, suffix);`
`1275`	`1275`	`}`
`1276`	`1276`
	`1277`	`+ identifierMap: {[key: string]:string} = {'year': 'int', 'binary': 'varchar', 'varbinary': 'varchar'};`
	`1278`	`+`
`1277`	`1279`	`parseType(node: CreateTableColumnNode, primaryKeyAlreadyDefined: boolean) {`
`1278`	`1280`
`1279`	`1281`	`let datatypes = SQLBaseType.baseTypes.map(type => type.toString());`
`@@ -1285,8 +1287,10 @@ export class Parser {`
`1285`	`1287`	`}`
`1286`	`1288`
`1287`	`1289`	`let identifier = <string>this.cct.value;`
`1288`		`- if (identifier.toLowerCase() == 'year') {`
`1289`		`- identifier = 'int';`
	`1290`	`+ let mappedIdentifier:string = this.identifierMap[identifier.toLocaleLowerCase()];`
	`1291`	`+`
	`1292`	`+ if (mappedIdentifier != null) {`
	`1293`	`+ identifier = mappedIdentifier;`
`1290`	`1294`	`}`
`1291`	`1295`
`1292`	`1296`	`let type = SQLBaseType.getBaseType(identifier);`
`@@ -1399,7 +1403,7 @@ export class Parser {`
`1399`	`1403`	`}`
`1400`	`1404`
`1401`	`1405`	`node.defaultValue = <string>this.cct.value;`
`1402`		`- if (typeof this.cct.value == "string") {`
	`1406`	`+ if (typeof this.cct.value == "string" && node.defaultValue.toLowerCase() != 'null' ) {`
`1403`	`1407`	`node.defaultValue = "'" + node.defaultValue + "'";`
`1404`	`1408`	`}`
`1405`	`1409`	`//@ts-ignore`
`@@ -1551,9 +1555,14 @@ export class Parser {`
`1551`	`1555`	`if (this.tt == TokenType.identifier) {`
`1552`	`1556`	`if (this.cct.isDoubleQuotedIdentifier) {`
`1553`	`1557`	`this.tt = TokenType.stringConstant`
`1554`		`- } else if ((this.cct.value + "").toLocaleLowerCase() == "date") {`
`1555`		`- this.nextToken();`
	`1558`	`+ } else {`
	`1559`	`+ let lv = (this.cct.value + "").toLocaleLowerCase();`
	`1560`	`+ if (["date", "_binary"].indexOf(lv) >= 0) {`
	`1561`	`+ this.nextToken();`
	`1562`	`+ }`
`1556`	`1563`	`}`
	`1564`	`+`
	`1565`	`+`
`1557`	`1566`	`}`
`1558`	`1567`
`1559`	`1568`