@naturalcycles/mysql-lib 3.12.4 → 3.14.0

package/dist/mysql.db.d.ts

@@ -1,3 +1,4 @@
+import { DBPatch } from '@naturalcycles/db-lib';
 import { BaseCommonDB, CommonDB, CommonDBCreateOptions, CommonDBOptions, CommonDBSaveOptions, DBQuery, RunQueryResult } from '@naturalcycles/db-lib';
 import { AnyObjectWithId, CommonLogger, JsonSchemaObject, JsonSchemaRootObject, ObjectWithId } from '@naturalcycles/js-lib';
 import { ReadableTyped } from '@naturalcycles/nodejs-lib';
@@ -66,4 +67,5 @@ export declare class MysqlDB extends BaseCommonDB implements CommonDB {
     createTable<ROW extends ObjectWithId>(table: string, schema: JsonSchemaObject<ROW>, opt?: CommonDBCreateOptions): Promise<void>;
     getTables(): Promise<string[]>;
     getTableSchema<ROW extends ObjectWithId>(table: string): Promise<JsonSchemaRootObject<ROW>>;
+    updateByQuery<ROW extends ObjectWithId>(q: DBQuery<ROW>, patch: DBPatch<ROW>): Promise<number>;
 }

package/dist/mysql.db.js

@@ -190,19 +190,27 @@ class MysqlDB extends db_lib_1.BaseCommonDB {
             }
             return v;
         }));
-        const verb = opt.saveMethod === 'insert' ? 'INSERT' : 'REPLACE';
         if (opt.assignGeneratedIds) {
             // Insert rows one-by-one, to get their auto-generated id
             let i = -1;
             for await (const row of rows) {
                 i++;
-                const sql = (0, query_util_1.insertSQL)(table, [row], verb, this.cfg.logger)[0];
-                const { insertId } = await this.runSQL({ sql });
-                // Mutate the input row with insertIt
-                rowsInput[i].id = insertId;
+                if (row.id) {
+                    // Update already existing
+                    const query = new db_lib_1.DBQuery(table).filterEq('id', row.id);
+                    await this.updateByQuery(query, (0, js_lib_1._omit)(row, ['id']));
+                }
+                else {
+                    // Create new
+                    const sql = (0, query_util_1.insertSQL)(table, [row], 'INSERT', this.cfg.logger)[0];
+                    const { insertId } = await this.runSQL({ sql });
+                    // Mutate the input row with insertIt
+                    rowsInput[i].id = insertId;
+                }
             }
             return;
         }
+        const verb = opt.saveMethod === 'insert' ? 'INSERT' : 'REPLACE';
         // inserts are split into multiple sentenses to respect the max_packet_size (1Mb usually)
         const sqls = (0, query_util_1.insertSQL)(table, rows, verb, this.cfg.logger);
         for await (const sql of sqls) {
@@ -255,6 +263,13 @@ class MysqlDB extends db_lib_1.BaseCommonDB {
         });
         return (0, mysql_schema_util_1.mysqlTableStatsToJsonSchemaField)(table, stats, this.cfg.logger);
     }
+    async updateByQuery(q, patch) {
+        const sql = (0, query_util_1.dbQueryToSQLUpdate)(q, patch);
+        if (!sql)
+            return 0;
+        const { affectedRows } = await this.runSQL({ sql });
+        return affectedRows;
+    }
 }
 tslib_1.__decorate([
     (0, js_lib_1._Memo)()

package/package.json

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

package/src/mysql.db.ts

@@ -1,5 +1,6 @@
 import { Readable, Transform } from 'node:stream'
 import { promisify } from 'node:util'
+import { DBPatch } from '@naturalcycles/db-lib'
 import {
   BaseCommonDB,
   CommonDB,
@@ -15,6 +16,7 @@ import {
   _mapKeys,
   _mapValues,
   _Memo,
+  _omit,
   AnyObjectWithId,
   CommonLogger,
   commonLoggerPrefix,
@@ -34,7 +36,7 @@ import {
   TypeCast,
 } from 'mysql'
 import * as mysql from 'mysql'
-import { dbQueryToSQLDelete, dbQueryToSQLSelect, insertSQL } from './query.util'
+import { dbQueryToSQLDelete, dbQueryToSQLSelect, dbQueryToSQLUpdate, insertSQL } from './query.util'
 import {
   jsonSchemaToMySQLDDL,
   mapNameFromMySQL,
@@ -304,24 +306,31 @@ export class MysqlDB extends BaseCommonDB implements CommonDB {
       }),
     )
 
-    const verb = opt.saveMethod === 'insert' ? 'INSERT' : 'REPLACE'
-
     if (opt.assignGeneratedIds) {
       // Insert rows one-by-one, to get their auto-generated id
 
       let i = -1
       for await (const row of rows) {
         i++
-        const sql = insertSQL(table, [row], verb, this.cfg.logger)[0]!
-        const { insertId } = await this.runSQL<OkPacket>({ sql })
-
-        // Mutate the input row with insertIt
-        rowsInput[i]!.id = insertId
+        if (row.id) {
+          // Update already existing
+          const query = new DBQuery(table).filterEq('id', row.id)
+          await this.updateByQuery(query, _omit(row, ['id']))
+        } else {
+          // Create new
+          const sql = insertSQL(table, [row], 'INSERT', this.cfg.logger)[0]!
+          const { insertId } = await this.runSQL<OkPacket>({ sql })
+
+          // Mutate the input row with insertIt
+          rowsInput[i]!.id = insertId
+        }
       }
 
       return
     }
 
+    const verb = opt.saveMethod === 'insert' ? 'INSERT' : 'REPLACE'
+
     // inserts are split into multiple sentenses to respect the max_packet_size (1Mb usually)
     const sqls = insertSQL(table, rows, verb, this.cfg.logger)
 
@@ -393,4 +402,15 @@ export class MysqlDB extends BaseCommonDB implements CommonDB {
 
     return mysqlTableStatsToJsonSchemaField<ROW>(table, stats, this.cfg.logger)
   }
+
+  override async updateByQuery<ROW extends ObjectWithId>(
+    q: DBQuery<ROW>,
+    patch: DBPatch<ROW>,
+  ): Promise<number> {
+    const sql = dbQueryToSQLUpdate(q, patch)
+    if (!sql) return 0
+
+    const { affectedRows } = await this.runSQL<OkPacket>({ sql })
+    return affectedRows
+  }
 }