@cheetah.js/orm 0.1.120 → 0.1.121

package/dist/driver/bun-driver.base.d.ts

@@ -54,5 +54,6 @@ export declare abstract class BunDriverBase implements Partial<DriverInterface>
     protected parseForeignKeyDefinition(consDef: string): {
         referencedColumnName: string;
         referencedTableName: string;
-    };
+    } | null;
+    private escapeRegex;
 }

package/dist/driver/bun-driver.base.js

@@ -220,26 +220,29 @@ class BunDriverBase {
         const columnName = row[columnNameField];
         return constraints
             .filter((c) => this.isForeignKeyConstraint(c, columnName))
-            .map((c) => this.parseForeignKeyDefinition(c.consDef));
+            .map((c) => this.parseForeignKeyDefinition(c.consDef))
+            .filter(Boolean);
     }
     isForeignKeyConstraint(constraint, columnName) {
         return (constraint.type === 'FOREIGN KEY' &&
             constraint.consDef.includes(columnName));
     }
     parseForeignKeyDefinition(consDef) {
-        const q = this.getIdentifierQuote();
-        const pattern = new RegExp(`REFERENCES\\s+${q}([^${q}]+)${q}\\s*\\(([^)]+)\\)`);
-        const filter = consDef.match(pattern);
-        if (!filter) {
-            throw new Error('Invalid constraint definition');
-        }
+        const quote = this.getIdentifierQuote();
+        const escapedQuote = this.escapeRegex(quote);
+        const pattern = new RegExp(`REFERENCES\\s+(?:${escapedQuote}([^${escapedQuote}]+)${escapedQuote}|([\\w.]+))\\s*\\(([^)]+)\\)`, 'i');
+        const match = consDef.match(pattern);
+        if (!match)
+            return null;
+        const tableName = (match[1] || match[2]).trim();
+        const columnName = match[3].split(',')[0].trim().replace(new RegExp(escapedQuote, 'g'), '');
         return {
-            referencedColumnName: filter[2]
-                .split(',')[0]
-                .trim()
-                .replace(new RegExp(q, 'g'), ''),
-            referencedTableName: filter[1],
+            referencedColumnName: columnName,
+            referencedTableName: tableName
         };
     }
+    escapeRegex(str) {
+        return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+    }
 }
 exports.BunDriverBase = BunDriverBase;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cheetah.js/orm",
-  "version": "0.1.120",
+  "version": "0.1.121",
   "description": "A simple ORM for Cheetah.js",
   "type": "commonjs",
   "main": "dist/index.js",
@@ -55,5 +55,5 @@
     "bun",
     "value-object"
   ],
-  "gitHead": "9c55643b2b3276698e20437ad23ba5f09f3759c4"
+  "gitHead": "04085d38962dd22e3967a52f00a7a9fa67746c6e"
 }