vona-module-a-ormdialect 5.0.13 → 5.0.15

package/dist/bean/databaseDialect.mysql.d.ts

@@ -1,5 +1,6 @@
 import type { Knex } from 'knex';
-import type { ConfigDatabaseClient, IFetchDatabasesResultItem, IFetchIndexesResultItem, TableIdentity } from 'vona-module-a-orm';
+import type { TableIdentity } from 'table-identity';
+import type { ConfigDatabaseClient, IFetchDatabasesResultItem, IFetchIndexesResultItem } from 'vona-module-a-orm';
 import { BeanDatabaseDialectBase } from 'vona-module-a-orm';
 export declare class DatabaseDialectMysql extends BeanDatabaseDialectBase {
     getConfigBase(): ConfigDatabaseClient | undefined;
@@ -7,7 +8,7 @@ export declare class DatabaseDialectMysql extends BeanDatabaseDialectBase {
     createDatabase(schemaBuilder: Knex.SchemaBuilder, databaseName: string): Promise<void>;
     dropDatabase(schemaBuilder: Knex.SchemaBuilder, databaseName: string): Promise<void>;
     fetchIndexes(schemaBuilder: Knex.SchemaBuilder, tableName: string): Promise<IFetchIndexesResultItem[]>;
-    insert(builder: Knex.QueryBuilder): Promise<TableIdentity[]>;
+    insert(builder: Knex.QueryBuilder, datas: any[]): Promise<TableIdentity[]>;
     query(result: any): any;
     viewDependents(builder: Knex.QueryBuilder, viewName: string): Promise<string[]>;
 }

package/dist/bean/databaseDialect.pg.d.ts

@@ -1,5 +1,6 @@
 import type { Knex } from 'knex';
-import type { ConfigDatabaseClient, IFetchDatabasesResultItem, IFetchIndexesResultItem, TableIdentity } from 'vona-module-a-orm';
+import type { TableIdentity } from 'table-identity';
+import type { ConfigDatabaseClient, IFetchDatabasesResultItem, IFetchIndexesResultItem } from 'vona-module-a-orm';
 import { BeanDatabaseDialectBase } from 'vona-module-a-orm';
 export declare class DatabaseDialectPg extends BeanDatabaseDialectBase {
     getConfigBase(): ConfigDatabaseClient | undefined;
@@ -7,7 +8,7 @@ export declare class DatabaseDialectPg extends BeanDatabaseDialectBase {
     createDatabase(schemaBuilder: Knex.SchemaBuilder, databaseName: string): Promise<void>;
     dropDatabase(schemaBuilder: Knex.SchemaBuilder, databaseName: string): Promise<void>;
     fetchIndexes(schemaBuilder: Knex.SchemaBuilder, tableName: string): Promise<IFetchIndexesResultItem[]>;
-    insert(builder: Knex.QueryBuilder): Promise<TableIdentity[]>;
+    insert(builder: Knex.QueryBuilder, datas: any[]): Promise<TableIdentity[]>;
     query(result: any): any;
     viewDependents(builder: Knex.QueryBuilder, viewName: string): Promise<string[]>;
 }

package/dist/index.js

@@ -1,5 +1,6 @@
 import { BeanInfo, Virtual, BeanScopeBase } from 'vona';
 import { promisify } from 'node:util';
+import { isNil } from '@cabloy/utils';
 import { DatabaseDialect, BeanDatabaseDialectBase } from 'vona-module-a-orm';
 import { Scope } from 'vona-module-a-bean';
 
@@ -43,9 +44,22 @@ let DatabaseDialectMysql = (_dec$3 = DatabaseDialect(), _dec2$3 = BeanInfo({
     });
     return items;
   }
-  async insert(builder) {
-    const items = await builder;
-    return items;
+  async insert(builder, datas) {
+    if (datas.length === 0) return [];
+    if (isNil(datas[0].id)) {
+      const ids = [];
+      for (const data of datas) {
+        const builder2 = builder.clone();
+        builder2.insert(data);
+        const items = await builder2;
+        ids.push(items[0]);
+      }
+      return ids;
+    } else {
+      builder.insert(datas);
+      await builder;
+      return datas.map(item => item.id);
+    }
   }
   query(result) {
     return result[0];
@@ -139,10 +153,17 @@ let DatabaseDialectPg = (_dec$1 = DatabaseDialect(), _dec2$1 = BeanInfo({
     });
     return items;
   }
-  async insert(builder) {
-    builder.returning('id');
-    const items = await builder;
-    return items.map(item => item.id);
+  async insert(builder, datas) {
+    if (datas.length === 0) return [];
+    if (isNil(datas[0].id)) {
+      builder.insert(datas).returning('id');
+      const items = await builder;
+      return items.map(item => item.id);
+    } else {
+      builder.insert(datas);
+      await builder;
+      return datas.map(item => item.id);
+    }
   }
   query(result) {
     return result.rows;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-a-ormdialect",
   "type": "module",
-  "version": "5.0.13",
+  "version": "5.0.15",
   "title": "a-ormdialect",
   "vonaModule": {
     "dependencies": {}