@mikro-orm/better-sqlite 6.0.0-dev.99 → 6.0.0-rc.1

package/BetterSqliteConnection.js

@@ -132,7 +132,7 @@ class BetterSqliteConnection extends knex_1.AbstractSqlConnection {
     }
     isRunQuery(query) {
         query = query.trim().toLowerCase();
-        if (query.startsWith('insert into') && query.includes(' returning ')) {
+        if ((query.startsWith('insert into') || query.startsWith('update ')) && query.includes(' returning ')) {
             return false;
         }
         return query.startsWith('insert into') ||
@@ -143,7 +143,7 @@ class BetterSqliteConnection extends knex_1.AbstractSqlConnection {
     getCallMethod(obj) {
         if (obj.method === 'raw') {
             const query = obj.sql.trim().toLowerCase();
-            if (query.startsWith('insert into') && query.includes(' returning ')) {
+            if ((query.startsWith('insert into') || query.startsWith('update ')) && query.includes(' returning ')) {
                 return 'all';
             }
             if (this.isRunQuery(query)) {

package/BetterSqliteSchemaHelper.d.ts

@@ -5,9 +5,10 @@ export declare class BetterSqliteSchemaHelper extends SchemaHelper {
     enableForeignKeysSQL(): string;
     supportsSchemaConstraints(): boolean;
     getListTablesSQL(): string;
+    private parseTableDefinition;
     getColumns(connection: AbstractSqlConnection, tableName: string, schemaName?: string): Promise<any[]>;
     getEnumDefinitions(connection: AbstractSqlConnection, checks: CheckDef[], tableName: string, schemaName: string): Promise<Dictionary<string[]>>;
-    getPrimaryKeys(connection: AbstractSqlConnection, indexes: IndexDef[] | undefined, tableName: string, schemaName?: string): Promise<string[]>;
+    getPrimaryKeys(connection: AbstractSqlConnection, indexes: IndexDef[], tableName: string, schemaName?: string): Promise<string[]>;
     getIndexes(connection: AbstractSqlConnection, tableName: string, schemaName?: string): Promise<IndexDef[]>;
     getChecks(connection: AbstractSqlConnection, tableName: string, schemaName?: string): Promise<CheckDef[]>;
     getForeignKeysSQL(tableName: string): string;

package/BetterSqliteSchemaHelper.js

@@ -16,15 +16,44 @@ class BetterSqliteSchemaHelper extends knex_1.SchemaHelper {
         return `select name as table_name from sqlite_master where type = 'table' and name != 'sqlite_sequence' and name != 'geometry_columns' and name != 'spatial_ref_sys' `
             + `union all select name as table_name from sqlite_temp_master where type = 'table' order by name`;
     }
+    parseTableDefinition(sql, cols) {
+        const columns = {};
+        // extract all columns definitions
+        let columnsDef = sql.replaceAll('\n', '').match(new RegExp(`create table [\`"']?.*?[\`"']? \\((.*)\\)`, 'i'))?.[1];
+        /* istanbul ignore else */
+        if (columnsDef) {
+            for (let i = cols.length - 1; i >= 0; i--) {
+                const col = cols[i];
+                const re = ` *, *[\`"']?${col.name}[\`"']? (.*)`;
+                const columnDef = columnsDef.match(new RegExp(re, 'i'));
+                /* istanbul ignore else */
+                if (columnDef) {
+                    columns[col.name] = { name: col.name, definition: columnDef[1] };
+                    columnsDef = columnsDef.substring(0, columnDef.index);
+                }
+            }
+        }
+        return columns;
+    }
     async getColumns(connection, tableName, schemaName) {
-        const columns = await connection.execute(`pragma table_info('${tableName}')`);
+        const columns = await connection.execute(`pragma table_xinfo('${tableName}')`);
         const sql = `select sql from sqlite_master where type = ? and name = ?`;
         const tableDefinition = await connection.execute(sql, ['table', tableName], 'get');
         const composite = columns.reduce((count, col) => count + (col.pk ? 1 : 0), 0) > 1;
         // there can be only one, so naive check like this should be enough
         const hasAutoincrement = tableDefinition.sql.toLowerCase().includes('autoincrement');
+        const columnDefinitions = this.parseTableDefinition(tableDefinition.sql, columns);
         return columns.map(col => {
             const mappedType = connection.getPlatform().getMappedType(col.type);
+            let generated;
+            if (col.hidden > 1) {
+                const storage = col.hidden === 2 ? 'virtual' : 'stored';
+                const re = `(generated always)? as \\((.*)\\)( ${storage})?$`;
+                const match = columnDefinitions[col.name].definition.match(re);
+                if (match) {
+                    generated = `${match[2]} ${storage}`;
+                }
+            }
             return {
                 name: col.name,
                 type: col.type,
@@ -34,6 +63,7 @@ class BetterSqliteSchemaHelper extends knex_1.SchemaHelper {
                 mappedType,
                 unsigned: false,
                 autoincrement: !composite && col.pk && this.platform.isNumericColumn(mappedType) && hasAutoincrement,
+                generated,
             };
         });
     }
@@ -52,7 +82,7 @@ class BetterSqliteSchemaHelper extends knex_1.SchemaHelper {
             return o;
         }, {});
     }
-    async getPrimaryKeys(connection, indexes = [], tableName, schemaName) {
+    async getPrimaryKeys(connection, indexes, tableName, schemaName) {
         const sql = `pragma table_info(\`${tableName}\`)`;
         const cols = await connection.execute(sql);
         return cols.filter(col => !!col.pk).map(col => col.name);
@@ -66,6 +96,7 @@ class BetterSqliteSchemaHelper extends knex_1.SchemaHelper {
             ret.push({
                 columnNames: [col.name],
                 keyName: 'primary',
+                constraint: true,
                 unique: true,
                 primary: true,
             });
@@ -76,6 +107,7 @@ class BetterSqliteSchemaHelper extends knex_1.SchemaHelper {
                 columnNames: [row.name],
                 keyName: index.name,
                 unique: !!index.unique,
+                constraint: !!index.unique,
                 primary: false,
             })));
         }

package/index.mjs

@@ -52,6 +52,8 @@ 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;
@@ -102,6 +104,7 @@ export const Index = mod.Index;
 export const IntegerType = mod.IntegerType;
 export const InvalidFieldNameException = mod.InvalidFieldNameException;
 export const IsolationLevel = mod.IsolationLevel;
+export const JoinType = mod.JoinType;
 export const JsonProperty = mod.JsonProperty;
 export const JsonType = mod.JsonType;
 export const Knex = mod.Knex;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/better-sqlite",
-  "version": "6.0.0-dev.99",
+  "version": "6.0.0-rc.1",
   "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,15 +58,15 @@
     "access": "public"
   },
   "dependencies": {
-    "@mikro-orm/knex": "~6.0.0-dev.99",
-    "better-sqlite3": "8.6.0",
+    "@mikro-orm/knex": "6.0.0-rc.1",
+    "better-sqlite3": "8.7.0",
     "fs-extra": "11.1.1",
     "sqlstring-sqlite": "0.1.1"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^5.8.1"
+    "@mikro-orm/core": "^5.9.2"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "~6.0.0-dev.99"
+    "@mikro-orm/core": "6.0.0-rc.1"
   }
 }