@platformatic/sql-mapper 0.29.0 → 0.30.0

package/lib/queries/sqlite.js

@@ -1,7 +1,15 @@
 'use strict'
 
 const { randomUUID } = require('crypto')
-const shared = require('./shared')
+
+function fixValue (value) {
+  if (value instanceof Date) {
+    return value.toISOString()
+  } else if (typeof value === 'boolean') {
+    return value ? 1 : 0
+  }
+  return value
+}
 
 async function listTables (db, sql) {
   const res = await db.query(sql`
@@ -113,7 +121,7 @@ async function insertOne (db, sql, table, schema, input, primaryKeys, fieldsToRe
 
   for (const [key, value] of Object.entries(input)) {
     insertedKeys.push(sql.ident(key))
-    insertedValues.push(sql.value(value))
+    insertedValues.push(sql.value(fixValue(value)))
   }
 
   const insertRawQuery = sql`
@@ -166,7 +174,7 @@ module.exports.insertOne = insertOne
 async function updateOne (db, sql, table, schema, input, primaryKeys, fieldsToRetrieve) {
   const pairs = Object.keys(input).map((key) => {
     const value = input[key]
-    return sql`${sql.ident(key)} = ${value}`
+    return sql`${sql.ident(key)} = ${fixValue(value)}`
   })
 
   const where = []
@@ -221,4 +229,19 @@ async function deleteAll (db, sql, table, schema, criteria, fieldsToRetrieve) {
 
 module.exports.deleteAll = deleteAll
 
-module.exports.updateMany = shared.updateMany
+async function updateMany (db, sql, table, schema, criteria, input, fieldsToRetrieve) {
+  const pairs = Object.keys(input).map((key) => {
+    const value = input[key]
+    return sql`${sql.ident(key)} = ${fixValue(value)}`
+  })
+  const update = sql`
+    UPDATE ${sql.ident(table)}
+    SET ${sql.join(pairs, sql`, `)}
+    WHERE ${sql.join(criteria, sql` AND `)}
+    RETURNING ${sql.join(fieldsToRetrieve, sql`, `)}
+    `
+  const res = await db.query(update)
+  return res
+}
+
+module.exports.updateMany = updateMany

package/mapper.js

@@ -80,15 +80,21 @@ async function connect ({ connectionString, log, onDatabaseLoad, poolSize = 10,
       queries = queriesFactory.mysql
     }
   } else if (connectionString.indexOf('sqlite') === 0) {
-    const sqlite = require('@databases/sqlite')
+    const sqlite = require('@matteo.collina/sqlite-pool')
     const path = connectionString.replace('sqlite://', '')
-    db = sqlite(connectionString === 'sqlite://:memory:' ? undefined : path)
-    db._database.on('trace', sql => {
-      log.trace({
-        query: {
-          text: sql
-        }
-      }, 'query')
+    db = sqlite.default(connectionString === 'sqlite://:memory:' ? undefined : path, {}, {
+      // TODO make this configurable
+      maxSize: 1,
+      // TODO make this configurable
+      // 10s max time to wait for a connection
+      releaseTimeoutMilliseconds: 10000,
+      onQuery ({ text, values }) {
+        log.trace({
+          query: {
+            text
+          }
+        }, 'query')
+      }
     })
     sql = sqlite.sql
     queries = queriesFactory.sqlite

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/sql-mapper",
-  "version": "0.29.0",
+  "version": "0.30.0",
   "description": "A data mapper utility for SQL databases",
   "main": "mapper.js",
   "types": "mapper.d.ts",
@@ -25,11 +25,11 @@
     "@databases/mysql": "^5.2.1",
     "@databases/pg": "^5.4.1",
     "@databases/sql": "^3.3.0",
-    "@databases/sqlite": "^4.0.2",
+    "@matteo.collina/sqlite-pool": "^0.3.0",
     "camelcase": "^6.3.0",
     "fastify-plugin": "^4.5.0",
     "inflected": "^2.1.0",
-    "@platformatic/types": "0.29.0"
+    "@platformatic/types": "0.30.0"
   },
   "tsd": {
     "directory": "test/types"

package/test/where.test.js

@@ -709,12 +709,14 @@ test('LIKE', async ({ pass, teardown, same, equal }) => {
 
   same(await entity.find({ where: { longText: { like: null } } }), [], 'where: { longText: { like: null } }')
 
-  same(await entity.find({ where: { counter: { like: 4 } } }), [{
-    id: '4',
-    title: 'atmosphere',
-    longText: 'The atmosphere is not a sphere',
-    counter: 4
-  }], 'where: { counter: { like: 4 } }')
+  if (!isSQLite) {
+    same(await entity.find({ where: { counter: { like: 4 } } }), [{
+      id: '4',
+      title: 'atmosphere',
+      longText: 'The atmosphere is not a sphere',
+      counter: 4
+    }], 'where: { counter: { like: 4 } }')
+  }
 
   same(await entity.find({ where: { counter: { like: '%4' } } }), [{
     id: '4',