@mikro-orm/sqlite 6.4.7-dev.0 → 7.0.0-dev.0

package/README.md

@@ -183,7 +183,6 @@ yarn add @mikro-orm/core @mikro-orm/mariadb       # for mysql/mariadb
 yarn add @mikro-orm/core @mikro-orm/postgresql    # for postgresql
 yarn add @mikro-orm/core @mikro-orm/mssql         # for mssql
 yarn add @mikro-orm/core @mikro-orm/sqlite        # for sqlite
-yarn add @mikro-orm/core @mikro-orm/better-sqlite # for better-sqlite
 yarn add @mikro-orm/core @mikro-orm/libsql        # for libsql
 ```
 
@@ -196,7 +195,6 @@ npm i -s @mikro-orm/core @mikro-orm/mariadb       # for mysql/mariadb
 npm i -s @mikro-orm/core @mikro-orm/postgresql    # for postgresql
 npm i -s @mikro-orm/core @mikro-orm/mssql         # for mssql
 npm i -s @mikro-orm/core @mikro-orm/sqlite        # for sqlite
-npm i -s @mikro-orm/core @mikro-orm/better-sqlite # for better-sqlite
 npm i -s @mikro-orm/core @mikro-orm/libsql        # for libsql
 ```
 

package/SqliteConnection.d.ts

@@ -1,5 +1,7 @@
-import { BaseSqliteConnection } from '@mikro-orm/knex';
+import { BaseSqliteConnection, type Dictionary } from '@mikro-orm/knex';
+import { SqliteDialect } from 'kysely';
 export declare class SqliteConnection extends BaseSqliteConnection {
-    createKnex(): void;
-    protected transformRawResult<T>(res: any, method: 'all' | 'get' | 'run'): T;
+    private database;
+    createKyselyDialect(options: Dictionary): SqliteDialect;
+    loadFile(path: string): Promise<void>;
 }

package/SqliteConnection.js

@@ -1,31 +1,25 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SqliteConnection = void 0;
 const knex_1 = require("@mikro-orm/knex");
+const kysely_1 = require("kysely");
+const better_sqlite3_1 = __importDefault(require("better-sqlite3"));
+const fs_extra_1 = require("fs-extra");
 class SqliteConnection extends knex_1.BaseSqliteConnection {
-    createKnex() {
-        this.client = this.createKnexClient(knex_1.SqliteKnexDialect);
-        this.connected = true;
+    database;
+    createKyselyDialect(options) {
+        const dbName = options.dbName ?? this.config.get('dbName');
+        this.database = new better_sqlite3_1.default(dbName, options);
+        return new kysely_1.SqliteDialect({
+            database: this.database,
+            onCreateConnection: this.options.onCreateConnection ?? this.config.get('onCreateConnection'),
+        });
     }
-    transformRawResult(res, method) {
-        if (method === 'get') {
-            return res[0];
-        }
-        if (method === 'all') {
-            return res;
-        }
-        if (Array.isArray(res)) {
-            return {
-                insertId: res[res.length - 1]?.id ?? 0,
-                affectedRows: res.length,
-                row: res[0],
-                rows: res,
-            };
-        }
-        return {
-            insertId: res.lastID,
-            affectedRows: res.changes,
-        };
+    async loadFile(path) {
+        this.database.exec((await (0, fs_extra_1.readFile)(path)).toString());
     }
 }
 exports.SqliteConnection = SqliteConnection;

package/SqliteDriver.js

@@ -6,7 +6,7 @@ const SqliteConnection_1 = require("./SqliteConnection");
 const SqlitePlatform_1 = require("./SqlitePlatform");
 class SqliteDriver extends knex_1.AbstractSqlDriver {
     constructor(config) {
-        super(config, new SqlitePlatform_1.SqlitePlatform(), SqliteConnection_1.SqliteConnection, ['knex', 'sqlite3']);
+        super(config, new SqlitePlatform_1.SqlitePlatform(), SqliteConnection_1.SqliteConnection, ['kysely', 'better-sqlite3']);
     }
 }
 exports.SqliteDriver = SqliteDriver;

package/SqlitePlatform.d.ts

@@ -1,8 +1,4 @@
 import { BaseSqlitePlatform } from '@mikro-orm/knex';
-import { SqliteSchemaHelper } from './SqliteSchemaHelper';
-import { SqliteExceptionConverter } from './SqliteExceptionConverter';
 export declare class SqlitePlatform extends BaseSqlitePlatform {
-    protected readonly schemaHelper: SqliteSchemaHelper;
-    protected readonly exceptionConverter: SqliteExceptionConverter;
     escape(value: any): string;
 }

package/SqlitePlatform.js

@@ -4,11 +4,7 @@ exports.SqlitePlatform = void 0;
 // @ts-ignore
 const sqlstring_sqlite_1 = require("sqlstring-sqlite");
 const knex_1 = require("@mikro-orm/knex");
-const SqliteSchemaHelper_1 = require("./SqliteSchemaHelper");
-const SqliteExceptionConverter_1 = require("./SqliteExceptionConverter");
 class SqlitePlatform extends knex_1.BaseSqlitePlatform {
-    schemaHelper = new SqliteSchemaHelper_1.SqliteSchemaHelper(this);
-    exceptionConverter = new SqliteExceptionConverter_1.SqliteExceptionConverter();
     escape(value) {
         return (0, sqlstring_sqlite_1.escape)(value, true, this.timezone);
     }

package/index.d.ts

@@ -2,6 +2,4 @@ export * from '@mikro-orm/knex';
 export * from './SqliteConnection';
 export * from './SqliteDriver';
 export * from './SqlitePlatform';
-export * from './SqliteSchemaHelper';
-export * from './SqliteExceptionConverter';
 export { SqliteMikroORM as MikroORM, SqliteOptions as Options, defineSqliteConfig as defineConfig, } from './SqliteMikroORM';

package/index.js

@@ -20,8 +20,6 @@ __exportStar(require("@mikro-orm/knex"), exports);
 __exportStar(require("./SqliteConnection"), exports);
 __exportStar(require("./SqliteDriver"), exports);
 __exportStar(require("./SqlitePlatform"), exports);
-__exportStar(require("./SqliteSchemaHelper"), exports);
-__exportStar(require("./SqliteExceptionConverter"), exports);
 var SqliteMikroORM_1 = require("./SqliteMikroORM");
 Object.defineProperty(exports, "MikroORM", { enumerable: true, get: function () { return SqliteMikroORM_1.SqliteMikroORM; } });
 Object.defineProperty(exports, "defineConfig", { enumerable: true, get: function () { return SqliteMikroORM_1.defineSqliteConfig; } });

package/index.mjs

@@ -19,12 +19,10 @@ export const ArrayType = mod.ArrayType;
 export const BaseEntity = mod.BaseEntity;
 export const BaseSqliteConnection = mod.BaseSqliteConnection;
 export const BaseSqlitePlatform = mod.BaseSqlitePlatform;
-export const BaseSqliteSchemaHelper = mod.BaseSqliteSchemaHelper;
 export const BeforeCreate = mod.BeforeCreate;
 export const BeforeDelete = mod.BeforeDelete;
 export const BeforeUpdate = mod.BeforeUpdate;
 export const BeforeUpsert = mod.BeforeUpsert;
-export const BetterSqliteKnexDialect = mod.BetterSqliteKnexDialect;
 export const BigIntType = mod.BigIntType;
 export const BlobType = mod.BlobType;
 export const BooleanType = mod.BooleanType;
@@ -112,14 +110,12 @@ export const JSON_KEY_OPERATORS = mod.JSON_KEY_OPERATORS;
 export const JoinType = mod.JoinType;
 export const JsonProperty = mod.JsonProperty;
 export const JsonType = mod.JsonType;
-export const Knex = mod.Knex;
-export const LibSqlKnexDialect = mod.LibSqlKnexDialect;
+export const Kysely = mod.Kysely;
 export const LoadStrategy = mod.LoadStrategy;
 export const LockMode = mod.LockMode;
 export const LockWaitTimeoutException = mod.LockWaitTimeoutException;
 export const ManyToMany = mod.ManyToMany;
 export const ManyToOne = mod.ManyToOne;
-export const MariaDbKnexDialect = mod.MariaDbKnexDialect;
 export const MediumIntType = mod.MediumIntType;
 export const MemoryCacheAdapter = mod.MemoryCacheAdapter;
 export const MetadataDiscovery = mod.MetadataDiscovery;
@@ -129,13 +125,12 @@ export const MetadataStorage = mod.MetadataStorage;
 export const MetadataValidator = mod.MetadataValidator;
 export const MikroORM = mod.MikroORM;
 export const MongoNamingStrategy = mod.MongoNamingStrategy;
-export const MonkeyPatchable = mod.MonkeyPatchable;
-export const MsSqlKnexDialect = mod.MsSqlKnexDialect;
-export const MySqlConnection = mod.MySqlConnection;
+export const MsSqlNativeQueryBuilder = mod.MsSqlNativeQueryBuilder;
 export const MySqlExceptionConverter = mod.MySqlExceptionConverter;
-export const MySqlKnexDialect = mod.MySqlKnexDialect;
+export const MySqlNativeQueryBuilder = mod.MySqlNativeQueryBuilder;
 export const MySqlPlatform = mod.MySqlPlatform;
 export const MySqlSchemaHelper = mod.MySqlSchemaHelper;
+export const NativeQueryBuilder = mod.NativeQueryBuilder;
 export const NodeState = mod.NodeState;
 export const NonUniqueFieldNameException = mod.NonUniqueFieldNameException;
 export const NotFoundError = mod.NotFoundError;
@@ -155,7 +150,7 @@ export const PlainObject = mod.PlainObject;
 export const Platform = mod.Platform;
 export const PopulateHint = mod.PopulateHint;
 export const PopulatePath = mod.PopulatePath;
-export const PostgreSqlKnexDialect = mod.PostgreSqlKnexDialect;
+export const PostgreSqlNativeQueryBuilder = mod.PostgreSqlNativeQueryBuilder;
 export const PrimaryKey = mod.PrimaryKey;
 export const PrimaryKeyProp = mod.PrimaryKeyProp;
 export const Property = mod.Property;
@@ -167,6 +162,7 @@ export const QueryOperator = mod.QueryOperator;
 export const QueryOrder = mod.QueryOrder;
 export const QueryOrderNumeric = mod.QueryOrderNumeric;
 export const QueryType = mod.QueryType;
+export const Raw = mod.Raw;
 export const RawQueryFragment = mod.RawQueryFragment;
 export const ReadOnlyException = mod.ReadOnlyException;
 export const Ref = mod.Ref;
@@ -191,10 +187,9 @@ export const SqlSchemaGenerator = mod.SqlSchemaGenerator;
 export const SqliteConnection = mod.SqliteConnection;
 export const SqliteDriver = mod.SqliteDriver;
 export const SqliteExceptionConverter = mod.SqliteExceptionConverter;
-export const SqliteKnexDialect = mod.SqliteKnexDialect;
+export const SqliteNativeQueryBuilder = mod.SqliteNativeQueryBuilder;
 export const SqlitePlatform = mod.SqlitePlatform;
 export const SqliteSchemaHelper = mod.SqliteSchemaHelper;
-export const SqliteTableCompiler = mod.SqliteTableCompiler;
 export const StringType = mod.StringType;
 export const SyntaxErrorException = mod.SyntaxErrorException;
 export const TableExistsException = mod.TableExistsException;
@@ -228,7 +223,7 @@ 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 isRaw = mod.isRaw;
 export const parseJsonSafe = mod.parseJsonSafe;
 export const raw = mod.raw;
 export const ref = mod.ref;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/sqlite",
-  "version": "6.4.7-dev.0",
+  "version": "7.0.0-dev.0",
   "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": ">= 18.12.0"
+    "node": ">= 22.11.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.4.7-dev.0",
+    "@mikro-orm/knex": "7.0.0-dev.0",
+    "better-sqlite3": "11.8.1",
     "fs-extra": "11.3.0",
-    "sqlite3": "5.1.7",
     "sqlstring-sqlite": "0.1.1"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^6.4.6"
+    "@mikro-orm/core": "^6.4.5"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.4.7-dev.0"
+    "@mikro-orm/core": "7.0.0-dev.0"
   }
 }

package/SqliteExceptionConverter.d.ts

@@ -1,9 +0,0 @@
-import { ExceptionConverter, type Dictionary, type DriverException } from '@mikro-orm/core';
-export declare class SqliteExceptionConverter extends ExceptionConverter {
-    /**
-     * @inheritDoc
-     * @link http://www.sqlite.org/c3ref/c_abort.html
-     * @link https://github.com/doctrine/dbal/blob/master/src/Driver/AbstractSQLiteDriver.php
-     */
-    convertException(exception: Error & Dictionary): DriverException;
-}

package/SqliteExceptionConverter.js

@@ -1,55 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SqliteExceptionConverter = void 0;
-const core_1 = require("@mikro-orm/core");
-class SqliteExceptionConverter extends core_1.ExceptionConverter {
-    /* istanbul ignore next */
-    /**
-     * @inheritDoc
-     * @link http://www.sqlite.org/c3ref/c_abort.html
-     * @link https://github.com/doctrine/dbal/blob/master/src/Driver/AbstractSQLiteDriver.php
-     */
-    convertException(exception) {
-        if (exception.message.includes('database is locked')) {
-            return new core_1.LockWaitTimeoutException(exception);
-        }
-        if (exception.message.includes('must be unique') ||
-            exception.message.includes('is not unique') ||
-            exception.message.includes('are not unique') ||
-            exception.message.includes('UNIQUE constraint failed')) {
-            return new core_1.UniqueConstraintViolationException(exception);
-        }
-        if (exception.message.includes('may not be NULL') || exception.message.includes('NOT NULL constraint failed')) {
-            return new core_1.NotNullConstraintViolationException(exception);
-        }
-        if (exception.message.includes('CHECK constraint failed')) {
-            return new core_1.CheckConstraintViolationException(exception);
-        }
-        if (exception.message.includes('no such table:')) {
-            return new core_1.TableNotFoundException(exception);
-        }
-        if (exception.message.includes('already exists')) {
-            return new core_1.TableExistsException(exception);
-        }
-        if (exception.message.includes('no such column:')) {
-            return new core_1.InvalidFieldNameException(exception);
-        }
-        if (exception.message.includes('ambiguous column name')) {
-            return new core_1.NonUniqueFieldNameException(exception);
-        }
-        if (exception.message.includes('syntax error')) {
-            return new core_1.SyntaxErrorException(exception);
-        }
-        if (exception.message.includes('attempt to write a readonly database')) {
-            return new core_1.ReadOnlyException(exception);
-        }
-        if (exception.message.includes('unable to open database file')) {
-            return new core_1.ConnectionException(exception);
-        }
-        if (exception.message.includes('FOREIGN KEY constraint failed')) {
-            return new core_1.ForeignKeyConstraintViolationException(exception);
-        }
-        return super.convertException(exception);
-    }
-}
-exports.SqliteExceptionConverter = SqliteExceptionConverter;

package/SqliteSchemaHelper.d.ts

@@ -1,3 +0,0 @@
-import { BaseSqliteSchemaHelper } from '@mikro-orm/knex';
-export declare class SqliteSchemaHelper extends BaseSqliteSchemaHelper {
-}

package/SqliteSchemaHelper.js

@@ -1,7 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SqliteSchemaHelper = void 0;
-const knex_1 = require("@mikro-orm/knex");
-class SqliteSchemaHelper extends knex_1.BaseSqliteSchemaHelper {
-}
-exports.SqliteSchemaHelper = SqliteSchemaHelper;