@platformatic/sql-mapper 1.16.0 → 1.18.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
       }
@@ -258,9 +275,64 @@ async function sqlMapper (app, opts) {
   })
 }
 
+async function dropTable (db, sql, table) {
+  try {
+    if (db.isSQLite) {
+      await db.query(sql`DROP TABLE ${sql(table)};`)
+    } else {
+      await db.query(sql`DROP TABLE ${sql(table)} CASCADE;`)
+    }
+    return table
+  } catch (err) {
+    // ignore, it will be dropped on the next roundon the next roundon the next roundon the next round
+  }
+}
+
+async function dropAllTables (db, sql, schemas) {
+  let queries
+  /* istanbul ignore next */
+  if (db.isPg) {
+    queries = queriesFactory.pg
+  } else if (db.isMySql) {
+    queries = queriesFactory.mysql
+  } else if (db.isMariaDB) {
+    queries = queriesFactory.mariadb
+  } else if (db.isSQLite) {
+    queries = queriesFactory.sqlite
+  }
+
+  const tables = new Set((await queries.listTables(db, sql, schemas)).map((t) => {
+    /* istanbul ignore next */
+    if (t.schema) {
+      return `${t.schema}.${t.table}`
+    }
+    return t.table
+  }))
+  let count = 0
+
+  while (tables.size > 0) {
+    if (count++ > 100) {
+      throw new Error('too many iterations, unable to clear the db')
+    }
+
+    const deletes = []
+    for (const table of tables) {
+      deletes.push(dropTable(db, sql, table))
+    }
+
+    const res = await Promise.all(deletes)
+    for (const table of res) {
+      if (table) {
+        tables.delete(table)
+      }
+    }
+  }
+}
+
 module.exports = fp(sqlMapper)
 module.exports.connect = connect
 module.exports.createConnectionPool = createConnectionPool
 module.exports.plugin = module.exports
 module.exports.utils = require('./lib/utils')
 module.exports.errors = errors
+module.exports.dropAllTables = dropAllTables

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/sql-mapper",
-  "version": "1.16.0",
+  "version": "1.18.0",
   "description": "A data mapper utility for SQL databases",
   "main": "mapper.js",
   "types": "mapper.d.ts",
@@ -20,7 +20,7 @@
     "glob": "^10.3.10",
     "snazzy": "^9.0.0",
     "standard": "^17.1.0",
-    "tsd": "^0.29.0"
+    "tsd": "^0.30.0"
   },
   "dependencies": {
     "@databases/mysql": "^6.0.0",
@@ -33,14 +33,14 @@
     "camelcase": "^6.3.0",
     "fastify-plugin": "^4.5.1",
     "inflected": "^2.1.0",
-    "@platformatic/utils": "1.16.0"
+    "@platformatic/utils": "1.18.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": "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",

package/.taprc

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