@mikro-orm/better-sqlite 6.0.0-dev.92 → 6.0.0-dev.94

package/BetterSqliteConnection.d.ts

@@ -1,8 +1,5 @@
-import type { Knex } from '@mikro-orm/knex';
-import { AbstractSqlConnection } from '@mikro-orm/knex';
+import { AbstractSqlConnection, type Knex } from '@mikro-orm/knex';
 export declare class BetterSqliteConnection extends AbstractSqlConnection {
-    static readonly RUN_QUERY_RE: RegExp;
-    static readonly RUN_QUERY_RETURNING: RegExp;
     createKnex(): void;
     connect(): Promise<void>;
     getDefaultClientUrl(): string;
@@ -14,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

@@ -68,7 +68,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);
@@ -130,12 +130,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) {
@@ -151,5 +164,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/BetterSqliteExceptionConverter.d.ts

@@ -1,5 +1,4 @@
-import type { Dictionary, DriverException } from '@mikro-orm/core';
-import { ExceptionConverter } from '@mikro-orm/core';
+import { ExceptionConverter, type Dictionary, type DriverException } from '@mikro-orm/core';
 export declare class BetterSqliteExceptionConverter extends ExceptionConverter {
     /**
      * @inheritDoc

package/BetterSqliteMikroORM.d.ts

@@ -1,5 +1,4 @@
-import { MikroORM } from '@mikro-orm/core';
-import type { Options, IDatabaseDriver } from '@mikro-orm/core';
+import { MikroORM, type Options, type IDatabaseDriver } from '@mikro-orm/core';
 import { BetterSqliteDriver } from './BetterSqliteDriver';
 /**
  * @inheritDoc

package/BetterSqliteMikroORM.js

@@ -7,6 +7,7 @@ const BetterSqliteDriver_1 = require("./BetterSqliteDriver");
  * @inheritDoc
  */
 class BetterSqliteMikroORM extends core_1.MikroORM {
+    static { this.DRIVER = BetterSqliteDriver_1.BetterSqliteDriver; }
     /**
      * @inheritDoc
      */
@@ -21,7 +22,6 @@ class BetterSqliteMikroORM extends core_1.MikroORM {
     }
 }
 exports.BetterSqliteMikroORM = BetterSqliteMikroORM;
-BetterSqliteMikroORM.DRIVER = BetterSqliteDriver_1.BetterSqliteDriver;
 /* istanbul ignore next */
 function defineBetterSqliteConfig(options) {
     return (0, core_1.defineConfig)({ driver: BetterSqliteDriver_1.BetterSqliteDriver, ...options });

package/BetterSqlitePlatform.d.ts

@@ -1,4 +1,4 @@
-import type { EntityProperty } from '@mikro-orm/core';
+import { type EntityProperty } from '@mikro-orm/core';
 import { AbstractSqlPlatform } from '@mikro-orm/knex';
 import { BetterSqliteSchemaHelper } from './BetterSqliteSchemaHelper';
 import { BetterSqliteExceptionConverter } from './BetterSqliteExceptionConverter';
@@ -38,6 +38,7 @@ export declare class BetterSqlitePlatform extends AbstractSqlPlatform {
     getVarcharTypeDeclarationSQL(column: {
         length?: number;
     }): string;
+    convertsJsonAutomatically(): boolean;
     allowsComparingTuples(): boolean;
     /**
      * This is used to narrow the value of Date properties as they will be stored as timestamps in sqlite.

package/BetterSqlitePlatform.js

@@ -49,6 +49,9 @@ class BetterSqlitePlatform extends knex_1.AbstractSqlPlatform {
     getVarcharTypeDeclarationSQL(column) {
         return 'text';
     }
+    convertsJsonAutomatically() {
+        return false;
+    }
     allowsComparingTuples() {
         return false;
     }

package/BetterSqliteSchemaHelper.d.ts

@@ -1,6 +1,5 @@
 import type { Connection, Dictionary } from '@mikro-orm/core';
-import type { AbstractSqlConnection, IndexDef, CheckDef } from '@mikro-orm/knex';
-import { SchemaHelper } from '@mikro-orm/knex';
+import { SchemaHelper, type AbstractSqlConnection, type IndexDef, type CheckDef } from '@mikro-orm/knex';
 export declare class BetterSqliteSchemaHelper extends SchemaHelper {
     disableForeignKeysSQL(): string;
     enableForeignKeysSQL(): string;

package/index.mjs

@@ -52,8 +52,6 @@ export const DatabaseObjectExistsException = mod.DatabaseObjectExistsException;
 export const DatabaseObjectNotFoundException = mod.DatabaseObjectNotFoundException;
 export const DatabaseSchema = mod.DatabaseSchema;
 export const DatabaseTable = mod.DatabaseTable;
-export const Dataloader = mod.Dataloader;
-export const DataloaderUtils = mod.DataloaderUtils;
 export const DateTimeType = mod.DateTimeType;
 export const DateType = mod.DateType;
 export const DeadlockException = mod.DeadlockException;
@@ -200,6 +198,8 @@ export const compareBuffers = mod.compareBuffers;
 export const compareObjects = mod.compareObjects;
 export const defineConfig = mod.defineConfig;
 export const equals = mod.equals;
+export const getOnConflictFields = mod.getOnConflictFields;
+export const getOnConflictReturningFields = mod.getOnConflictReturningFields;
 export const helper = mod.helper;
 export const knex = mod.knex;
 export const parseJsonSafe = mod.parseJsonSafe;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/better-sqlite",
-  "version": "6.0.0-dev.92",
+  "version": "6.0.0-dev.94",
   "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",
@@ -46,7 +46,7 @@
   },
   "homepage": "https://mikro-orm.io",
   "engines": {
-    "node": ">= 16.0.0"
+    "node": ">= 18.12.0"
   },
   "scripts": {
     "build": "yarn clean && yarn compile && yarn copy && yarn run -T gen-esm-wrapper index.js index.mjs",
@@ -58,15 +58,15 @@
     "access": "public"
   },
   "dependencies": {
-    "@mikro-orm/knex": "~6.0.0-dev.92",
-    "better-sqlite3": "8.4.0",
+    "@mikro-orm/knex": "~6.0.0-dev.94",
+    "better-sqlite3": "8.6.0",
     "fs-extra": "11.1.1",
     "sqlstring-sqlite": "0.1.1"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^5.7.12"
+    "@mikro-orm/core": "^5.8.0"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "~6.0.0-dev.92"
+    "@mikro-orm/core": "~6.0.0-dev.94"
   }
 }