@platformatic/sql-mapper 1.15.1 → 1.17.0

package/mapper.js

@@ -101,7 +101,7 @@ async function createConnectionPool ({ log, connectionString, poolSize, idleTime
   return { db, sql }
 }
 
-async function connect ({ connectionString, log, onDatabaseLoad, poolSize, ignore = {}, autoTimestamp = true, hooks = {}, schema, limit = {}, dbschema, cache, idleTimeoutMilliseconds, queueTimeoutMilliseconds, acquireLockTimeoutMilliseconds }) {
+async function connect ({ connectionString, log, onDatabaseLoad, poolSize, include = {}, ignore = {}, autoTimestamp = true, hooks = {}, schema, limit = {}, dbschema, cache, idleTimeoutMilliseconds, queueTimeoutMilliseconds, acquireLockTimeoutMilliseconds }) {
   if (typeof autoTimestamp === 'boolean' && autoTimestamp === true) {
     autoTimestamp = defaultAutoTimestampFields
   }
@@ -164,6 +164,19 @@ async function connect ({ connectionString, log, onDatabaseLoad, poolSize, ignor
     }
 
     const schemaTables = dbschema.map(table => table.table)
+    if (Object.keys(include).length) {
+      for (const includedTable of Object.keys(include)) {
+        if (!schemaTables.includes(includedTable)) {
+          const nearestTable = findNearestString(schemaTables, includedTable)
+          let warningMessage = `Specified table "${includedTable}" not found.`
+          if (nearestTable) {
+            warningMessage += ` Did you mean "${nearestTable}"?`
+          }
+          log.warn(warningMessage)
+        }
+      }
+    }
+
     for (const ignoredTable of Object.keys(ignore)) {
       if (!schemaTables.includes(ignoredTable)) {
         const nearestTable = findNearestString(schemaTables, ignoredTable)
@@ -182,6 +195,10 @@ async function connect ({ connectionString, log, onDatabaseLoad, poolSize, ignor
       if (typeof table !== 'string') {
         throw new errors.TableMustBeAStringError(table)
       }
+      // If include is being used and a table is not explicitly included add it to the ignore object
+      if (Object.keys(include).length && !include[table]) {
+        ignore[table] = true
+      }
       if (ignore[table] === true) {
         continue
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/sql-mapper",
-  "version": "1.15.1",
+  "version": "1.17.0",
   "description": "A data mapper utility for SQL databases",
   "main": "mapper.js",
   "types": "mapper.d.ts",
@@ -15,11 +15,12 @@
   },
   "homepage": "https://github.com/platformatic/platformatic#readme",
   "devDependencies": {
+    "@matteo.collina/tspl": "^0.1.0",
     "fastify": "^4.23.2",
+    "glob": "^10.3.10",
     "snazzy": "^9.0.0",
     "standard": "^17.1.0",
-    "tap": "^16.3.9",
-    "tsd": "^0.29.0"
+    "tsd": "^0.30.0"
   },
   "dependencies": {
     "@databases/mysql": "^6.0.0",
@@ -32,19 +33,20 @@
     "camelcase": "^6.3.0",
     "fastify-plugin": "^4.5.1",
     "inflected": "^2.1.0",
-    "@platformatic/utils": "1.15.1"
+    "@platformatic/utils": "1.17.0"
   },
   "tsd": {
     "directory": "test/types"
   },
   "scripts": {
     "lint": "standard | snazzy",
-    "test": "standard | snazzy && npm run test:typescript && npm run test:postgresql && npm run test:mariadb && npm run test:mysql && npm run test:mysql8 && npm run test:sqlite",
-    "test:postgresql": "DB=postgresql tap test/*.test.js",
-    "test:mariadb": "DB=mariadb tap test/*.test.js",
-    "test:mysql": "DB=mysql tap test/*.test.js",
-    "test:mysql8": "DB=mysql8 tap test/*.test.js",
-    "test:sqlite": "DB=sqlite tap test/*.test.js",
+    "test": "npm run lint && npm run test:typescript && npm run test:postgresql && npm run test:mariadb && npm run test:mysql && npm run test:mysql8 && npm run test:sqlite",
+    "test:runner": "node ./test/runner.js",
+    "test:postgresql": "DB=postgresql npm run test:runner",
+    "test:mariadb": "DB=mariadb npm run test:runner",
+    "test:mysql": "DB=mysql npm run test:runner",
+    "test:mysql8": "DB=mysql8 npm run test:runner",
+    "test:sqlite": "DB=sqlite npm run test:runner",
     "test:typescript": "tsd"
   }
 }

package/.taprc

@@ -1 +0,0 @@
-jobs: 1