lex unicode escape squences like \u407f to increase compatibility to OpenOffice

martin-pabst · martin-pabst · commit 8d364ebcaee0 · 2024-04-28T07:31:26.000+02:00
diff --git a/src/client/compiler/lexer/Lexer.ts b/src/client/compiler/lexer/Lexer.ts
@@ -413,7 +413,22 @@ export class Lexer {
             if (char == "\\") {
                 let escapeChar = EscapeSequenceList[this.nextChar];
                 if (escapeChar == null) {
-                    this.pushError('Die Escape-Sequenz \\' + this.nextChar + ' gibt es nicht.', 2);
+                    if(this.nextChar == 'u'){       // Unicode escape sequences (for OpenOffice)
+                        let hex: string = "";
+                        this.next(); // skip \
+                        this.next(); // skip u
+                        while ("abcdef0123456789".indexOf(this.currentChar) >= 0 && hex.length < 4) {
+                            hex += this.currentChar;
+                            if(hex.length < 4) this.next();
+                        }
+                        if (hex.length < 4) {
+                            this.pushError('Unbekanntes Unicode-Zeichen: u' + hex, 1 + hex.length);
+                        } else {
+                            char = String.fromCodePoint(parseInt(hex, 16));
+                        }
+                    } else {
+                        this.pushError('Die Escape-Sequenz \\' + this.nextChar + ' gibt es nicht.', 2);
+                    }
                 } else {
                     char = escapeChar;
                     this.next();
diff --git a/src/client/compiler/lexer/Token.ts b/src/client/compiler/lexer/Token.ts
@@ -29,6 +29,7 @@ export enum TokenType {
     keywordPrimary,
     keywordForeign,
     keywordTable,
+    keywordSchema,
     keywordTables,
     keywordColumn,
     keywordDrop,
@@ -202,6 +203,7 @@ export var TokenTypeReadable: {[tt: number]: string} = {
     [TokenType.keywordPrimary]: "primary",
     [TokenType.keywordForeign]: "foreign",
     [TokenType.keywordTable]: "table",
+    [TokenType.keywordSchema]: "schema",
     [TokenType.keywordTables]: "tables",
     [TokenType.keywordColumn]: "column",
     [TokenType.keywordDrop]: "drop",
diff --git a/src/client/compiler/parser/Parser.ts b/src/client/compiler/parser/Parser.ts
@@ -500,8 +500,13 @@ export class Parser {
         }
 
         this.nextToken(); // skip 'set'
+
+        // SET DATABASE Collation "German"  ( -> OpenOffice)
+        if(this.comesToken(TokenType.keywordDatabase)){
+            this.nextToken();
+        } 
         this.expect(TokenType.identifier, true);
-        this.expect(TokenType.equal, true);
+        this.comesToken(TokenType.equal, true);   // skip = if present
         this.expect([TokenType.identifier, TokenType.stringConstant, TokenType.integerConstant, TokenType.charConstant, TokenType.booleanConstant, TokenType.floatingPointConstant], true);
 
         node.endPosition = this.getCurrentPosition();
@@ -1025,6 +1030,7 @@ export class Parser {
                 return this.parseCreateTable();
             case TokenType.keywordView:
                 return this.parseCreateView();
+            case TokenType.keywordSchema:
             default:
                 this.nextToken();
                 this.pushError("Nach 'create' wird 'table' erwartet.");
diff --git a/src/client/tools/DatabaseTools.ts b/src/client/tools/DatabaseTools.ts
@@ -249,7 +249,7 @@ export class DatabaseTool {
             let values = result[0]?.values;
             let types: ("table"|"view")[] = values?.map(value => value[2]);
 
-            values?.forEach(value => sql1 += `PRAGMA table_info(${value[0]});\nPRAGMA foreign_key_list(${value[0]});\nselect count(*) from ${value[0]};\n\n`)
+            values?.forEach(value => sql1 += `PRAGMA table_info("${value[0]}");\nPRAGMA foreign_key_list("${value[0]}");\nselect count(*) from "${value[0]}";\n\n`)
 
             if (sql1 != "") {
                 this.executeQuery(sql1, (result1) => {
@@ -260,7 +260,11 @@ export class DatabaseTool {
 
                     callback(that.databaseStructure);
 
-                }, (error) => { console.log(error)});
+                }, (error) => { 
+                    console.log(error);
+                    that.databaseStructure = { tables: [] };
+                    callback(that.databaseStructure);
+                });
             } else {
                 that.databaseStructure = { tables: [] };
                 callback(that.databaseStructure);
