@quereus/quereus 2.7.0 → 2.8.0

package/dist/src/parser/parser.js

@@ -2172,8 +2172,20 @@ export class Parser {
             this.consume(TokenType.RPAREN, "Expected ')' after view column list.");
         }
         this.consumeKeyword('AS', "Expected 'AS' before SELECT statement for CREATE VIEW.");
+        // CREATE VIEW body may optionally start with a WITH (CTE) clause; the WITH attaches to
+        // the inner SELECT, not to the CREATE VIEW itself.
+        let innerWith;
+        if (this.check(TokenType.WITH)) {
+            innerWith = this.tryParseWithClause();
+        }
         const selectStartToken = this.consume(TokenType.SELECT, "Expected 'SELECT' after 'AS' in CREATE VIEW.");
-        const select = this.selectStatement(selectStartToken, withClause);
+        const select = this.selectStatement(selectStartToken, innerWith ?? withClause);
+        if (innerWith) {
+            select.withClause = innerWith;
+            if (innerWith.loc && select.loc) {
+                select.loc.start = innerWith.loc.start;
+            }
+        }
         // Parse optional WITH TAGS
         let tags;
         if (this.matchKeyword('WITH')) {
@@ -2519,7 +2531,12 @@ export class Parser {
             }
             else if (this.peekKeyword('INDEX')) {
                 this.advance();
-                items.push(this.declareIndexItem());
+                items.push(this.declareIndexItem(false));
+            }
+            else if (this.peekKeyword('UNIQUE')) {
+                this.advance();
+                this.consumeKeyword('INDEX', "Expected 'INDEX' after 'UNIQUE'.");
+                items.push(this.declareIndexItem(true));
             }
             else if (this.peekKeyword('VIEW')) {
                 this.advance();
@@ -2645,7 +2662,7 @@ export class Parser {
         };
         return { type: 'declaredTable', tableStmt };
     }
-    declareIndexItem() {
+    declareIndexItem(isUnique) {
         const indexName = this.consumeIdentifier('Expected index name.');
         this.consumeKeyword('ON', "Expected 'ON' after index name.");
         const tableName = this.consumeIdentifier('Expected table name after ON.');
@@ -2668,7 +2685,7 @@ export class Parser {
             table: { type: 'identifier', name: tableName },
             ifNotExists: false,
             columns,
-            isUnique: false,
+            isUnique,
             tags
         };
         return { type: 'declaredIndex', indexStmt };
@@ -3241,7 +3258,10 @@ export class Parser {
             this.consume(TokenType.LPAREN, "Expected '(' after CHECK.");
             const expr = this.expression();
             endToken = this.consume(TokenType.RPAREN, "Expected ')' after CHECK expression.");
-            result = { type: 'check', name, expr, operations, loc: _createLoc(startToken, endToken) };
+            const onConflict = this.parseConflictClause();
+            if (onConflict)
+                endToken = this.previous();
+            result = { type: 'check', name, expr, operations, onConflict, loc: _createLoc(startToken, endToken) };
         }
         else if (this.match(TokenType.DEFAULT)) {
             const expr = this.expression();
@@ -3334,7 +3354,10 @@ export class Parser {
             this.consume(TokenType.LPAREN, "Expected '(' after CHECK.");
             const expr = this.expression();
             endToken = this.consume(TokenType.RPAREN, "Expected ')' after CHECK expression.");
-            result = { type: 'check', name, expr, operations, loc: _createLoc(startToken, endToken) };
+            const onConflict = this.parseConflictClause();
+            if (onConflict)
+                endToken = this.previous();
+            result = { type: 'check', name, expr, operations, onConflict, loc: _createLoc(startToken, endToken) };
         }
         else if (this.match(TokenType.FOREIGN)) {
             this.consume(TokenType.KEY, "Expected KEY after FOREIGN.");
@@ -3457,7 +3480,7 @@ export class Parser {
         }
         else if (this.match(TokenType.NO)) {
             this.consume(TokenType.ACTION, "Expected ACTION after NO.");
-            return 'ignore';
+            return 'restrict';
         }
         throw this.error(this.peek(), "Expected foreign key action (SET NULL, SET DEFAULT, CASCADE, RESTRICT, NO ACTION).");
     }