@platformatic/sql-mapper 0.15.1 → 0.17.0

package/lib/queries/sqlite.js

@@ -124,33 +124,40 @@ async function insertOne (db, sql, table, schema, input, primaryKeys, fieldsToRe
   if (fieldsToRetrieve.length === 0) {
     await db.query(insertRawQuery)
     return {}
+  } else if (typeof db.tx === 'function') {
+    return db.tx(handleAutoIncrement)
   } else {
-    return db.tx(async (transaction) => {
-      await transaction.query(insertRawQuery)
+    // TODO add a log at trace level if we do this
+    // There are not nested transactions in SQLite, so we can just run the query
+    // because we are already in a transaction.
+    return handleAutoIncrement(db)
+  }
+
+  async function handleAutoIncrement (transaction) {
+    await transaction.query(insertRawQuery)
 
-      let selectInsertedRawQuery = null
-      if (hasAutoIncrementPK) {
-        selectInsertedRawQuery = sql`
+    let selectInsertedRawQuery = null
+    if (hasAutoIncrementPK) {
+      selectInsertedRawQuery = sql`
           SELECT ${sql.join(fieldsToRetrieve, sql`, `)}
           FROM ${sql.ident(table)}
           WHERE _rowid_ = last_insert_rowid()
         `
-      } else {
-        const where = []
-        for (const [key, value] of Object.entries(primaryKeyValues)) {
-          where.push(sql`${sql.ident(key)} = ${sql.value(value)}`)
-        }
+    } else {
+      const where = []
+      for (const [key, value] of Object.entries(primaryKeyValues)) {
+        where.push(sql`${sql.ident(key)} = ${sql.value(value)}`)
+      }
 
-        selectInsertedRawQuery = sql`
+      selectInsertedRawQuery = sql`
           SELECT ${sql.join(fieldsToRetrieve, sql`, `)}
           FROM ${sql.ident(table)}
           WHERE ${sql.join(where, sql` AND `)}
         `
-      }
+    }
 
-      const [insertedRaw] = await transaction.query(selectInsertedRawQuery)
-      return insertedRaw
-    })
+    const [insertedRaw] = await transaction.query(selectInsertedRawQuery)
+    return insertedRaw
   }
 }
 

package/mapper.js

@@ -172,6 +172,15 @@ async function sqlMapper (app, opts) {
   // TODO this would need to be refactored as other plugins
   // would need to use this same namespace
   app.decorate('platformatic', mapper)
+
+  app.decorateRequest('platformaticContext', null)
+  app.addHook('onRequest', function (req, reply, done) {
+    req.platformaticContext = {
+      app: this, // uses the encapsulated fastify instance of the route
+      reply
+    }
+    done()
+  })
 }
 
 module.exports = fp(sqlMapper)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/sql-mapper",
-  "version": "0.15.1",
+  "version": "0.17.0",
   "description": "A data mapper utility for SQL databases",
   "main": "mapper.js",
   "repository": {
@@ -14,19 +14,19 @@
   },
   "homepage": "https://github.com/platformatic/platformatic#readme",
   "devDependencies": {
-    "fastify": "^4.10.2",
+    "fastify": "^4.13.0",
     "snazzy": "^9.0.0",
     "standard": "^17.0.0",
-    "tap": "^16.3.2",
-    "tsd": "^0.25.0"
+    "tap": "^16.3.4",
+    "tsd": "^0.26.0"
   },
   "dependencies": {
     "@databases/mysql": "^5.2.1",
     "@databases/pg": "^5.4.1",
-    "@databases/sql": "^3.2.0",
+    "@databases/sql": "^3.3.0",
     "@databases/sqlite": "^4.0.2",
     "camelcase": "^6.3.0",
-    "fastify-plugin": "^4.4.0",
+    "fastify-plugin": "^4.5.0",
     "inflected": "^2.1.0"
   },
   "tsd": {

package/test/entity.test.js

@@ -971,3 +971,37 @@ test('stored and virtual generated columns should return for pg', { skip: (isPg
     }
   }), [{ id: 2, test: 8, testStored: 16, testVirtual: 32 }])
 })
+
+test('nested transactions', async ({ equal, same, teardown, rejects }) => {
+  async function onDatabaseLoad (db, sql) {
+    await clear(db, sql)
+    teardown(() => db.dispose())
+    if (isSQLite) {
+      await db.query(sql`CREATE TABLE pages (
+        id INTEGER PRIMARY KEY,
+        the_title VARCHAR(42)
+      );`)
+    } else {
+      await db.query(sql`CREATE TABLE pages (
+        id SERIAL PRIMARY KEY,
+        the_title VARCHAR(255)
+      );`)
+    }
+  }
+  const mapper = await connect({
+    connectionString: connInfo.connectionString,
+    log: fakeLogger,
+    onDatabaseLoad,
+    ignore: {},
+    hooks: {}
+  })
+
+  await mapper.db.tx(async (tx) => {
+    const insertResult = await mapper.entities.page.save({
+      input: {},
+      fields: ['id', 'theTitle'],
+      tx
+    })
+    same(insertResult, { id: '1', theTitle: null })
+  })
+})

package/test/mapper.test.js

@@ -193,3 +193,31 @@ test('missing connectionString', async ({ rejects }) => {
 
   await rejects(app.ready(), /connectionString/)
 })
+
+test('platformaticContext', async ({ plan, equal, teardown }) => {
+  plan(3)
+  async function onDatabaseLoad (db, sql) {
+    teardown(async () => await clear(db, sql))
+
+    await db.query(sql`CREATE TABLE IF NOT EXISTS pages (
+      id SERIAL PRIMARY KEY,
+      title VARCHAR(255) NOT NULL
+    );`)
+  }
+  const app = fastify()
+  teardown(() => app.close())
+  app.register(plugin, {
+    connectionString: connInfo.connectionString,
+    onDatabaseLoad
+  })
+
+  app.get('/', function (req, reply) {
+    const ctx = req.platformaticContext
+    equal(app, ctx.app)
+    equal(reply, ctx.reply)
+    return 'hello world'
+  })
+
+  const res = await app.inject('/')
+  equal(res.statusCode, 200)
+})