@platformatic/sql-mapper 0.9.2 → 0.11.0

package/lib/entity.js

@@ -85,9 +85,9 @@ function createMapper (defaultDb, sql, log, table, fields, primaryKeys, relation
     }
 
     let now
-    if (autoTimestamp && fields.updated_at) {
+    if (autoTimestamp && fields[autoTimestamp.updatedAt]) {
       now = new Date()
-      input.updated_at = now
+      input[autoTimestamp.updatedAt] = now
     }
     if (hasPrimaryKeys) { // update
       const res = await queries.updateOne(db, sql, table, schema, input, primaryKeys, fieldsToRetrieve)
@@ -100,10 +100,10 @@ function createMapper (defaultDb, sql, log, table, fields, primaryKeys, relation
     }
 
     // insert
-    if (autoTimestamp && fields.inserted_at) {
+    if (autoTimestamp && fields[autoTimestamp.createdAt]) {
       /* istanbul ignore next */
       now = now || new Date()
-      input.inserted_at = now
+      input[autoTimestamp.createdAt] = now
     }
     const res = await queries.insertOne(db, sql, table, schema, input, primaryKeysTypes, fieldsToRetrieve)
     return fixOutput(res)
@@ -118,11 +118,11 @@ function createMapper (defaultDb, sql, log, table, fields, primaryKeys, relation
     if (autoTimestamp) {
       const now = new Date()
       for (const input of inputs) {
-        if (fields.inserted_at) {
-          input.insertedAt = now
+        if (fields[autoTimestamp.createdAt]) {
+          input[autoTimestamp.createdAt] = now
         }
-        if (fields.updated_at) {
-          input.updatedAt = now
+        if (fields[autoTimestamp.updatedAt]) {
+          input[autoTimestamp.updatedAt] = now
         }
       }
     }
@@ -151,10 +151,9 @@ function createMapper (defaultDb, sql, log, table, fields, primaryKeys, relation
       throw new Error('Input not provided.')
     }
     const input = fixInput(args.input)
-    let now
-    if (autoTimestamp && fields.updated_at) {
-      now = new Date()
-      input.updated_at = now
+    if (autoTimestamp && fields[autoTimestamp.updatedAt]) {
+      const now = new Date()
+      input[autoTimestamp.updatedAt] = now
     }
     const criteria = computeCriteria(args)
 
@@ -340,7 +339,7 @@ async function buildEntity (db, sql, log, table, queries, autoTimestamp, schema,
       acc[column.column_name].enum = column.column_type.match(/'(.+?)'/g).map(enumValue => enumValue.slice(1, enumValue.length - 1))
     }
 
-    if (autoTimestamp && (column.column_name === 'updated_at' || column.column_name === 'inserted_at')) {
+    if (autoTimestamp && (column.column_name === autoTimestamp.createdAt || column.column_name === autoTimestamp.updatedAt)) {
       acc[column.column_name].autoTimestamp = true
     }
     return acc

package/mapper.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const buildEntity = require('./lib/entity')
 const queriesFactory = require('./lib/queries')
 const fp = require('fastify-plugin')
@@ -39,7 +41,15 @@ async function buildConnection (log, createConnectionPool, connectionString, poo
   return db
 }
 
+const defaultAutoTimestampFields = {
+  createdAt: 'created_at',
+  updatedAt: 'updated_at'
+}
+
 async function connect ({ connectionString, log, onDatabaseLoad, poolSize = 10, ignore = {}, autoTimestamp = true, hooks = {}, schema, limit = {} }) {
+  if (typeof autoTimestamp === 'boolean' && autoTimestamp === true) {
+    autoTimestamp = defaultAutoTimestampFields
+  }
   // TODO validate config using the schema
   if (!connectionString) {
     throw new Error('connectionString is required')
@@ -115,7 +125,7 @@ async function connect ({ connectionString, log, onDatabaseLoad, poolSize = 10,
       const entity = await buildEntity(db, sql, log, table, queries, autoTimestamp, schema, useSchema, ignore[table] || {}, limit)
       // Check for primary key of all entities
       if (entity.primaryKeys.size === 0) {
-        throw Error(`Cannot find any primary keys for ${entity.name} entity`)
+        throw Error(`Cannot find any primary keys for ${entity.name} entity: ${JSON.stringify(entity)}`)
       }
 
       entities[entity.singularName] = entity

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/sql-mapper",
-  "version": "0.9.2",
+  "version": "0.11.0",
   "description": "A data mapper utility for SQL databases",
   "main": "mapper.js",
   "repository": {

package/test/helper.js

@@ -4,7 +4,12 @@
 // See https://node-postgres.com/features/types/
 process.env.TZ = 'UTC'
 
-const connInfo = {}
+const connInfo = {
+  autoTimestamp: {
+    createdAt: 'inserted_at',
+    updatedAt: 'updated_at'
+  }
+}
 
 if (!process.env.DB || process.env.DB === 'postgresql') {
   connInfo.connectionString = 'postgres://postgres:postgres@127.0.0.1/postgres'

package/test/updateMany.test.js

@@ -248,7 +248,7 @@ test('updateMany successful and update updated_at', async ({ pass, teardown, sam
           title VARCHAR(42),
           long_text TEXT,
           counter INTEGER,
-          inserted_at TIMESTAMP,
+          created_at TIMESTAMP,
           updated_at TIMESTAMP
         );`)
       } else if (isMysql) {
@@ -257,7 +257,7 @@ test('updateMany successful and update updated_at', async ({ pass, teardown, sam
           title VARCHAR(42),
           long_text TEXT,
           counter INTEGER,
-          inserted_at TIMESTAMP NULL DEFAULT NULL,
+          created_at TIMESTAMP NULL DEFAULT NULL,
           updated_at TIMESTAMP NULL DEFAULT NULL
         );`)
       } else {
@@ -266,7 +266,7 @@ test('updateMany successful and update updated_at', async ({ pass, teardown, sam
           title VARCHAR(42),
           long_text TEXT,
           counter INTEGER,
-          inserted_at TIMESTAMP,
+          created_at TIMESTAMP,
           updated_at TIMESTAMP
         );`)
       }
@@ -313,6 +313,6 @@ test('updateMany successful and update updated_at', async ({ pass, teardown, sam
 
   const updatedPost3 = (await entity.find({ where: { id: { eq: '3' } } }))[0]
   same(updatedPost3.title, 'Updated title')
-  same(createdPost3.insertedAt, updatedPost3.insertedAt)
+  same(createdPost3.createdAt, updatedPost3.createdAt)
   notSame(createdPost3.updatedAt, updatedPost3.updatedAt)
 })