sql-tools 0.1.0 → 0.1.3

package/bin/sql-tools.js

@@ -36,6 +36,11 @@ SqlTools.places={
 
 SqlTools.olap={};
 
+/** @param {string[]} elements */
+function join1wp(elements){
+    return (elements.length!=1?'(':'') + elements.join(', ') + (elements.length!=1?')':'');
+}
+
 function coalesce(){
     var i=0;
     while(i<arguments.length-1 && arguments[i]==null) i++;
@@ -172,7 +177,7 @@ SqlTools.structuredData.sqlsDeletes = function sqlsDeletes(data, structuredData,
             queriesArray.push(
                 "delete from " + SqlTools.quoteIdent(childTable.tableName) + 
                 " where " + conditionChild.join(' and ') + 
-                " and " + (parentPk.length!=1?'(':'') + parentPk.join(', ') + (parentPk.length!=1?')':'') + `
+                " and " + join1wp(parentPk) + `
                  not in (select ${parentPk.join(', ')} from jsonb_populate_recordset(null::${SqlTools.quoteIdent(childTable.tableName)}, 
                     ${SqlTools.quoteLiteral(JSON.stringify(data[childTable.tableName]))}::jsonb
                     ));`
@@ -231,12 +236,14 @@ SqlTools.structuredData.sqlsUpserts = function sqlsUpserts(data, structureData,
     for(var i in pkFields){
         where_expr.push(SqlTools.quoteIdent(structureData.tableName) + '.' + SqlTools.quoteIdent(pkFields[i]) + '=' + SqlTools.quoteLiteral(pkValues[i]));
     }
+    var doUpdate = ()=>`do update set ( ${SqlTools.quoteIdentArray(fieldsWithoutPk).join(',')} ) = 
+    ${fieldsWithoutPk.length == 1?'row':''} ( ${SqlTools.quoteLiteralArray(valuesWithoutPk).join(',')} )
+        where ${where_expr.join(' and ')}`
     var query = `
-        insert into ` + SqlTools.quoteIdent(structureData.tableName) + ` ( ` + fields.join(',') + `)
-            values (` + SqlTools.quoteLiteralArray(values).join(',') + `)
-            on conflict (` + SqlTools.quoteIdentArray(pkFields).join(',') + `)
-            do update set (` + SqlTools.quoteIdentArray(fieldsWithoutPk).join(',') + `) = (` + SqlTools.quoteLiteralArray(valuesWithoutPk).join(',') + `)
-                where ` + where_expr.join(' and ') + `;`
+        insert into ${SqlTools.quoteIdent(structureData.tableName)}  ( ${fields.join(',')} )
+            values ( ${SqlTools.quoteLiteralArray(values).join(',')} )
+            on conflict ( ${SqlTools.quoteIdentArray(pkFields).join(',')} )
+            ${(fieldsWithoutPk.length == 0)?' do nothing':doUpdate()} ;`
     childQueries.unshift(query);
     return childQueries;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sql-tools",
   "description": "olap for sql non-olap engines / and other tools",
-  "version": "0.1.0",
+  "version": "0.1.3",
   "author": "Codenautas <codenautas@googlegroups.com>",
   "license": "MIT",
   "repository": "codenautas/sql-tools",
@@ -12,21 +12,23 @@
     }
   ],
   "main": "bin/sql-tools.js",
-  "dependencies": {},
+  "dependencies": {
+    "type-store": "^0.4.5"
+  },
   "devDependencies": {
     "expect.js": "~0.3.1",
     "istanbul": "~0.4.5",
-    "mocha": "~6.1.4",
-    "mini-tools": "~1.0.8",
-    "pg-promise-strict": "~1.0.10"
+    "mini-tools": "~1.13.4",
+    "mocha": "~11.7.5",
+    "pg-promise-strict": "~1.4.3"
   },
   "engines": {
     "node": ">= 0.8.0"
   },
   "scripts": {
     "test": "mocha --reporter spec --bail --check-leaks --globals json4allRegisteredTypes test/",
-    "test-ci": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --reporter spec --check-leaks test/",
-    "test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --reporter dot --check-leaks test/",
+    "test-ci": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --reporter spec --check-leaks --globals json4allRegisteredTypes test/",
+    "test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --reporter dot --check-leaks --globals json4allRegisteredTypes test/",
     "start": "node example/server.js"
   },
   "files": [