ffc-pay-etl-framework 1.4.7 → 2.0.0

package/app/database-connections/postgres-database-connection.js

@@ -1,7 +1,8 @@
-const DEFAULT_PORT = 5432
-const { Sequelize } = require('sequelize')
+const { Database } = require('ffc-database')
 const debug = require('debug')('connection')
 
+const DEFAULT_PORT = 5432
+
 /**
  *
  * @param {Object} options
@@ -11,32 +12,44 @@ const debug = require('debug')('connection')
  * @param {Object} options.database
  * @param {Object} options.host
  * @param {Object} options.port
+ * @param {Object} [options.schema]
+ * @param {Object} [options.ssl]
+ * @param {Object} [options.tables]
+ * @param {Object} [options.pool]
+ * @param {Boolean} [options.useAzureManagedIdentity]
+ * @param {String} [options.azureClientId]
  * @returns Connection
  */
 async function postgresDatabaseConnection (options) {
   const connectionname = options.connectionname
-  const username = options.username
-  const password = options.password
-  const database = options.database
-  const host = options.host
-  const port = options.port || DEFAULT_PORT
 
-  const sequelize = new Sequelize(database, username, password, {
-    host,
-    port,
-    dialect: 'postgres',
-    logging: false
+  const database = new Database({
+    database: options.database,
+    username: options.username,
+    password: options.password,
+    host: options.host,
+    port: options.port || DEFAULT_PORT,
+    schema: options.schema,
+    ssl: options.ssl,
+    tables: options.tables,
+    pool: options.pool,
+    useAzureManagedIdentity: options.useAzureManagedIdentity,
+    azureClientId: options.azureClientId
   })
 
   try {
-    await sequelize.authenticate()
-    debug('sequelize.authenticate succeeded')
+    const connection = database.connect()
+    await connection.client.raw('select 1')
+    debug('database connection succeeded')
     return {
       name: connectionname,
-      db: sequelize
+      db: {
+        ...connection,
+        query: (sql) => connection.client.raw(sql)
+      }
     }
   } catch (e) {
-    debug('sequelize.authenticate failed')
+    debug('database connection failed')
     debug(e)
     throw e
   }

package/app/database-connections/provided-connection.js

@@ -2,15 +2,15 @@
  *
  * @param {Object} options
  * @param {Object} options.connectionname
- * @param {Object} options.sequelize
+ * @param {Object} options.connection - the object returned by ffc-database's Database.connect()
  * @returns Connection
  */
 async function providedConnection (options) {
   const connectionname = options.connectionname
-  const sequelize = options.sequelize
+  const connection = options.connection
   return {
     name: connectionname,
-    db: sequelize
+    db: connection ? { ...connection, query: (sql) => connection.client.raw(sql) } : connection
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ffc-pay-etl-framework",
-  "version": "1.4.7",
+  "version": "2.0.0",
   "description": "A framework for creating ETL pipelines in node",
   "main": "index.js",
   "repository": "https://github.com/DEFRA/ffc-pay-etl-framework",
@@ -14,7 +14,7 @@
   "dependencies": {
     "@faker-js/faker": "10.5.0",
     "csv-parse": "7.0.2",
-    "sequelize": "6.37.8",
+    "ffc-database": "2.0.0",
     "validator": "13.15.23"
   },
   "devDependencies": {
@@ -26,12 +26,6 @@
     "nodemon": "3.1.4",
     "prettier": "3.3.3"
   },
-  "overrides": {
-    "sequelize": {
-      "uuid": "11.1.1",
-      "moment": "2.31.0"
-    }
-  },
   "scripts": {
     "test": "PORT=0 node --experimental-vm-modules node_modules/jest/bin/jest.js --testPathPatterns=test/unit",
     "test:unit": "PORT=0 node --experimental-vm-modules node_modules/jest/bin/jest.js --testPathPatterns=test/unit",
@@ -49,4 +43,4 @@
       "**/test-output/**"
     ]
   }
-}
+}