@naturalcycles/mysql-lib 3.13.0 → 3.14.1

package/dist/mysql.db.js

@@ -190,32 +190,41 @@ class MysqlDB extends db_lib_1.BaseCommonDB {
             }
             return v;
         }));
-        const verb = opt.saveMethod === 'insert' ? 'INSERT' : 'REPLACE';
-        if (opt.assignGeneratedIds && opt.saveMethod !== 'update') {
+        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;
         }
-        // inserts are split into multiple sentenses to respect the max_packet_size (1Mb usually)
         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) {
-                (0, js_lib_1._assert)(row.id, 'Cannot update without providing an id');
+                // 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;
         }
-        else {
-            const sqls = (0, query_util_1.insertSQL)(table, rows, verb, this.cfg.logger);
-            for await (const sql of sqls) {
-                await this.runSQL({ sql });
-            }
+        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) {
+            await this.runSQL({ sql });
         }
     }
     // DELETE

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.13.0",
+  "version": "3.14.1",
   "description": "MySQL client implementing CommonDB interface",
   "keywords": [
     "mysql",

package/src/mysql.db.ts

@@ -306,37 +306,46 @@ export class MysqlDB extends BaseCommonDB implements CommonDB {
       }),
     )
 
-    const verb = opt.saveMethod === 'insert' ? 'INSERT' : 'REPLACE'
-
-    if (opt.assignGeneratedIds && opt.saveMethod !== 'update') {
+    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
     }
 
-    // inserts are split into multiple sentenses to respect the max_packet_size (1Mb usually)
     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) {
-        _assert(row.id, 'Cannot update without providing an id')
+        // 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']))
       }
-    } else {
-      const sqls = insertSQL(table, rows, verb, this.cfg.logger)
+      return
+    }
 
-      for await (const sql of sqls) {
-        await this.runSQL({ sql })
-      }
+    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)
+
+    for await (const sql of sqls) {
+      await this.runSQL({ sql })
     }
   }
 

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_', '.')
 }