@naturalcycles/mysql-lib 3.11.1 → 3.11.2

package/dist/mysql.db.d.ts

@@ -4,7 +4,7 @@ import { ReadableTyped } from '@naturalcycles/nodejs-lib';
 import { Connection, Pool, PoolConfig, PoolConnection, QueryOptions } from 'mysql';
 export interface MysqlDBOptions extends CommonDBOptions {
 }
-export interface MysqlDBSaveOptions<ROW extends ObjectWithId = AnyObjectWithId> extends CommonDBSaveOptions<ROW> {
+export interface MysqlDBSaveOptions<ROW extends Partial<ObjectWithId> = AnyObjectWithId> extends CommonDBSaveOptions<ROW> {
 }
 /**
  * @default false / undefined
@@ -50,7 +50,7 @@ export declare class MysqlDB extends BaseCommonDB implements CommonDB {
     runSQLString(s: string): Promise<void>;
     runQueryCount<ROW extends ObjectWithId>(q: DBQuery<ROW>, _opt?: CommonDBOptions): Promise<number>;
     streamQuery<ROW extends ObjectWithId, OUT = ROW>(q: DBQuery<ROW>, _opt?: MysqlDBOptions): ReadableTyped<OUT>;
-    saveBatch<ROW extends ObjectWithId>(table: string, _rows: ROW[], _opt?: MysqlDBSaveOptions<ROW>): Promise<void>;
+    saveBatch<ROW extends Partial<ObjectWithId>>(table: string, _rows: ROW[], opt?: MysqlDBSaveOptions<ROW>): Promise<void>;
     /**
      * Limitation: always returns [], regardless of which rows are actually deleted
      */

package/dist/mysql.db.js

@@ -171,7 +171,7 @@ class MysqlDB extends db_lib_1.BaseCommonDB {
         }));
     }
     // SAVE
-    async saveBatch(table, _rows, _opt) {
+    async saveBatch(table, _rows, opt = {}) {
         if (!_rows.length)
             return;
         // Stringify object values
@@ -179,7 +179,7 @@ class MysqlDB extends db_lib_1.BaseCommonDB {
             return v && typeof v === 'object' && !Buffer.isBuffer(v) ? JSON.stringify(v) : v;
         }));
         // inserts are split into multiple sentenses to respect the max_packet_size (1Mb usually)
-        const sqls = (0, query_util_1.insertSQL)(table, rows, 'REPLACE', this.cfg.logger);
+        const sqls = (0, query_util_1.insertSQL)(table, rows, opt.saveMethod === 'insert' ? 'INSERT' : 'REPLACE', this.cfg.logger);
         for await (const sql of sqls) {
             await this.runSQL({ sql });
         }

package/package.json

@@ -36,7 +36,7 @@
   "engines": {
     "node": ">=14.15.0"
   },
-  "version": "3.11.1",
+  "version": "3.11.2",
   "description": "MySQL client implementing CommonDB interface",
   "keywords": [
     "mysql",

package/src/mysql.db.ts

@@ -34,7 +34,7 @@ import {
 } from './schema/mysql.schema.util'
 
 export interface MysqlDBOptions extends CommonDBOptions {}
-export interface MysqlDBSaveOptions<ROW extends ObjectWithId = AnyObjectWithId>
+export interface MysqlDBSaveOptions<ROW extends Partial<ObjectWithId> = AnyObjectWithId>
   extends CommonDBSaveOptions<ROW> {}
 
 /**
@@ -264,10 +264,10 @@ export class MysqlDB extends BaseCommonDB implements CommonDB {
   }
 
   // SAVE
-  override async saveBatch<ROW extends ObjectWithId>(
+  override async saveBatch<ROW extends Partial<ObjectWithId>>(
     table: string,
     _rows: ROW[],
-    _opt?: MysqlDBSaveOptions<ROW>,
+    opt: MysqlDBSaveOptions<ROW> = {},
   ): Promise<void> {
     if (!_rows.length) return
 
@@ -279,7 +279,12 @@ export class MysqlDB extends BaseCommonDB implements CommonDB {
     )
 
     // inserts are split into multiple sentenses to respect the max_packet_size (1Mb usually)
-    const sqls = insertSQL(table, rows, 'REPLACE', this.cfg.logger)
+    const sqls = insertSQL(
+      table,
+      rows,
+      opt.saveMethod === 'insert' ? 'INSERT' : 'REPLACE',
+      this.cfg.logger,
+    )
 
     for await (const sql of sqls) {
       await this.runSQL({ sql })