@naturalcycles/mysql-lib 3.14.0 → 3.14.2

package/dist/mysql.db.js

@@ -6,7 +6,7 @@ const node_stream_1 = require("node:stream");
 const node_util_1 = require("node:util");
 const db_lib_1 = require("@naturalcycles/db-lib");
 const js_lib_1 = require("@naturalcycles/js-lib");
-const colors_1 = require("@naturalcycles/nodejs-lib/dist/colors");
+const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const mysql = require("mysql");
 const query_util_1 = require("./query.util");
 const mysql_schema_util_1 = require("./schema/mysql.schema.util");
@@ -52,7 +52,7 @@ class MysqlDB extends db_lib_1.BaseCommonDB {
     pool() {
         const pool = mysql.createPool(this.cfg);
         const { host, database, logger } = this.cfg;
-        logger.log(`connected to ${(0, colors_1.white)(host + '/' + database)}`);
+        logger.log(`connected to ${(0, nodejs_lib_1.white)(host + '/' + database)}`);
         if (this.cfg.debugConnections) {
             pool.on('acquire', con => {
                 logger.log(`acquire(${con.threadId})`);
@@ -210,6 +210,16 @@ class MysqlDB extends db_lib_1.BaseCommonDB {
             }
             return;
         }
+        if (opt.saveMethod === 'update') {
+            // TODO: This fails if a combination of entities with id and without id are parsed
+            for await (const row of rows) {
+                // Update already existing
+                (0, js_lib_1._assert)(row.id, 'id is required for updating');
+                const query = new db_lib_1.DBQuery(table).filterEq('id', row.id);
+                await this.updateByQuery(query, (0, js_lib_1._omit)(row, ['id']));
+            }
+            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);
@@ -271,7 +281,7 @@ class MysqlDB extends db_lib_1.BaseCommonDB {
         return affectedRows;
     }
 }
+exports.MysqlDB = MysqlDB;
 tslib_1.__decorate([
     (0, js_lib_1._Memo)()
 ], MysqlDB.prototype, "pool", null);
-exports.MysqlDB = MysqlDB;

package/dist/query.util.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.dbQueryToSQLUpdate = exports.insertSQLSetSingle = exports.insertSQLSingle = exports.insertSQL = exports.dbQueryToSQLDelete = exports.dbQueryToSQLSelect = void 0;
 const js_lib_1 = require("@naturalcycles/js-lib");
-const colors_1 = require("@naturalcycles/nodejs-lib/dist/colors");
+const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const mysql = require("mysql");
 const mysql_schema_util_1 = require("./schema/mysql.schema.util");
 const MAX_PACKET_SIZE = 1024 * 1024; // 1Mb
@@ -84,7 +84,7 @@ function insertSQL(table, rows, verb = 'INSERT', logger = console) {
     if (sql) {
         sqls.push(sql); // last one
     }
-    logger.log(`${(0, colors_1.white)(table)} large sql query (${(0, colors_1.yellow)((0, js_lib_1._hb)(full.length))}) was split into ${(0, colors_1.yellow)(sqls.length)} chunks`);
+    logger.log(`${(0, nodejs_lib_1.white)(table)} large sql query (${(0, nodejs_lib_1.yellow)((0, js_lib_1._hb)(full.length))}) was split into ${(0, nodejs_lib_1.yellow)(sqls.length)} chunks`);
     return sqls;
     // todo: handle "upsert" later
 }

package/dist/schema/mysql.schema.util.js

@@ -100,10 +100,10 @@ exports.mysqlTableStatsToJsonSchemaField = mysqlTableStatsToJsonSchemaField;
  * @param name
  */
 function mapNameToMySQL(name) {
-    return name.replace(/\./g, '_dot_');
+    return name.replaceAll('.', '_dot_');
 }
 exports.mapNameToMySQL = mapNameToMySQL;
 function mapNameFromMySQL(name) {
-    return name.replace(/_dot_/g, '.');
+    return name.replaceAll('_dot_', '.');
 }
 exports.mapNameFromMySQL = mapNameFromMySQL;

package/package.json

@@ -12,7 +12,7 @@
   },
   "devDependencies": {
     "@naturalcycles/dev-lib": "^13.2.1",
-    "@types/node": "^18.7.13",
+    "@types/node": "^20.2.3",
     "dotenv": "^16.0.0",
     "jest": "^29.0.0"
   },
@@ -36,7 +36,7 @@
   "engines": {
     "node": ">=16.15.0"
   },
-  "version": "3.14.0",
+  "version": "3.14.2",
   "description": "MySQL client implementing CommonDB interface",
   "keywords": [
     "mysql",

package/src/mysql.db.ts

@@ -25,7 +25,7 @@ import {
   ObjectWithId,
 } from '@naturalcycles/js-lib'
 import { ReadableTyped } from '@naturalcycles/nodejs-lib'
-import { white } from '@naturalcycles/nodejs-lib/dist/colors'
+import { white } from '@naturalcycles/nodejs-lib'
 import {
   Connection,
   OkPacket,
@@ -193,7 +193,7 @@ export class MysqlDB extends BaseCommonDB implements CommonDB {
     if (!ids.length) return []
     const q = new DBQuery<ROW>(table).filterEq('id', ids)
     const { rows } = await this.runQuery(q, opt)
-    return rows.map(r => _mapKeys(r, k => mapNameFromMySQL(k)) as any)
+    return rows.map(r => _mapKeys(r, k => mapNameFromMySQL(k as string)) as any)
   }
 
   // QUERY
@@ -209,13 +209,13 @@ export class MysqlDB extends BaseCommonDB implements CommonDB {
     }
 
     const rows = (await this.runSQL<ROW[]>({ sql })).map(
-      row => _mapKeys(_filterUndefinedValues(row, true), k => mapNameFromMySQL(k)) as any,
+      row => _mapKeys(_filterUndefinedValues(row, true), k => mapNameFromMySQL(k as string)) as any,
     )
 
     // edge case where 0 fields are selected
     if (q._selectedFieldNames?.length === 0) {
       return {
-        rows: rows.map(_ => ({} as any)),
+        rows: rows.map(_ => ({}) as any),
       }
     }
 
@@ -293,7 +293,7 @@ export class MysqlDB extends BaseCommonDB implements CommonDB {
 
     // Stringify object values
     const rows = rowsInput.map(row =>
-      _mapValues(row, (_k, v) => {
+      _mapValues<ROW>(row, (_k, v) => {
         if (v && typeof v === 'object' && !Buffer.isBuffer(v)) {
           // This is to avoid implicit Date stringification and mismatch: it gets saved as Date, but loaded as String
           _assert(
@@ -329,8 +329,18 @@ export class MysqlDB extends BaseCommonDB implements CommonDB {
       return
     }
 
-    const verb = opt.saveMethod === 'insert' ? 'INSERT' : 'REPLACE'
+    if (opt.saveMethod === 'update') {
+      // TODO: This fails if a combination of entities with id and without id are parsed
+      for await (const row of rows) {
+        // Update already existing
+        _assert(row.id, 'id is required for updating')
+        const query = new DBQuery(table).filterEq('id', row.id)
+        await this.updateByQuery(query, _omit(row, ['id']))
+      }
+      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)
 

package/src/query.util.ts

@@ -1,6 +1,6 @@
 import { DBQuery, DBQueryFilterOperator } from '@naturalcycles/db-lib'
 import { _hb, CommonLogger } from '@naturalcycles/js-lib'
-import { white, yellow } from '@naturalcycles/nodejs-lib/dist/colors'
+import { white, yellow } from '@naturalcycles/nodejs-lib'
 import { QueryOptions } from 'mysql'
 import * as mysql from 'mysql'
 import { mapNameToMySQL } from './schema/mysql.schema.util'

package/src/schema/mysql.schema.util.ts

@@ -126,9 +126,9 @@ export function mysqlTableStatsToJsonSchemaField<T extends AnyObject = any>(
  * @param name
  */
 export function mapNameToMySQL(name: string): string {
-  return name.replace(/\./g, '_dot_')
+  return name.replaceAll('.', '_dot_')
 }
 
 export function mapNameFromMySQL(name: string): string {
-  return name.replace(/_dot_/g, '.')
+  return name.replaceAll('_dot_', '.')
 }