@mikro-orm/better-sqlite 5.7.13-dev.16 → 5.7.13-dev.18

package/BetterSqliteConnection.d.ts

@@ -1,8 +1,6 @@
 import type { Knex } from '@mikro-orm/knex';
 import { AbstractSqlConnection } from '@mikro-orm/knex';
 export declare class BetterSqliteConnection extends AbstractSqlConnection {
-    static readonly RUN_QUERY_RE: RegExp;
-    static readonly RUN_QUERY_RETURNING: RegExp;
     connect(): Promise<void>;
     getDefaultClientUrl(): string;
     getClientUrl(): string;
@@ -13,5 +11,6 @@ export declare class BetterSqliteConnection extends AbstractSqlConnection {
      * monkey patch knex' BetterSqlite Dialect so it returns inserted id when doing raw insert query
      */
     private getPatchedDialect;
+    private isRunQuery;
     private getCallMethod;
 }

package/BetterSqliteConnection.js

@@ -64,7 +64,7 @@ class BetterSqliteConnection extends knex_1.AbstractSqlConnection {
         const processResponse = Sqlite3Dialect.prototype.processResponse;
         Sqlite3Dialect.prototype.__patched = true;
         Sqlite3Dialect.prototype.processResponse = (obj, runner) => {
-            if (obj.method === 'raw' && obj.sql.trim().match(BetterSqliteConnection.RUN_QUERY_RE)) {
+            if (obj.method === 'raw' && this.isRunQuery(obj.sql)) {
                 return obj.response ?? obj.context;
             }
             return processResponse(obj, runner);
@@ -126,12 +126,25 @@ class BetterSqliteConnection extends knex_1.AbstractSqlConnection {
         };
         return Sqlite3Dialect;
     }
-    getCallMethod(obj) {
-        if (obj.method === 'raw' && obj.sql.trim().match(BetterSqliteConnection.RUN_QUERY_RETURNING)) {
-            return 'all';
+    isRunQuery(query) {
+        query = query.trim().toLowerCase();
+        if (query.startsWith('insert into') && query.includes(' returning ')) {
+            return false;
         }
-        if (obj.method === 'raw' && obj.sql.trim().match(BetterSqliteConnection.RUN_QUERY_RE)) {
-            return 'run';
+        return query.startsWith('insert into') ||
+            query.startsWith('update') ||
+            query.startsWith('delete') ||
+            query.startsWith('truncate');
+    }
+    getCallMethod(obj) {
+        if (obj.method === 'raw') {
+            const query = obj.sql.trim().toLowerCase();
+            if (query.startsWith('insert into') && query.includes(' returning ')) {
+                return 'all';
+            }
+            if (this.isRunQuery(query)) {
+                return 'run';
+            }
         }
         /* istanbul ignore next */
         switch (obj.method) {
@@ -147,5 +160,3 @@ class BetterSqliteConnection extends knex_1.AbstractSqlConnection {
     }
 }
 exports.BetterSqliteConnection = BetterSqliteConnection;
-BetterSqliteConnection.RUN_QUERY_RE = /^insert into|^update|^delete|^truncate/;
-BetterSqliteConnection.RUN_QUERY_RETURNING = /^insert into ([\s\S])* returning .*/;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/better-sqlite",
-  "version": "5.7.13-dev.16",
+  "version": "5.7.13-dev.18",
   "description": "TypeScript ORM for Node.js based on Data Mapper, Unit of Work and Identity Map patterns. Supports MongoDB, MySQL, PostgreSQL and SQLite databases as well as usage with vanilla JavaScript.",
   "main": "index.js",
   "module": "index.mjs",
@@ -58,7 +58,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@mikro-orm/knex": "~5.7.13-dev.16",
+    "@mikro-orm/knex": "~5.7.13-dev.18",
     "better-sqlite3": "8.4.0",
     "fs-extra": "11.1.1",
     "sqlstring-sqlite": "0.1.1"
@@ -67,10 +67,10 @@
     "@mikro-orm/core": "^5.7.12"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "~5.7.13-dev.16",
-    "@mikro-orm/entity-generator": "~5.7.13-dev.16",
-    "@mikro-orm/migrations": "~5.7.13-dev.16",
-    "@mikro-orm/seeder": "~5.7.13-dev.16"
+    "@mikro-orm/core": "~5.7.13-dev.18",
+    "@mikro-orm/entity-generator": "~5.7.13-dev.18",
+    "@mikro-orm/migrations": "~5.7.13-dev.18",
+    "@mikro-orm/seeder": "~5.7.13-dev.18"
   },
   "peerDependenciesMeta": {
     "@mikro-orm/entity-generator": {