Merge branch 'master' into query-changes-1

getodk · Feb 8, 2025 · a0b70a3 · a0b70a3
2 parents 0b60e85 + a1db5fb
commit a0b70a3
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 6 deletions.
diff --git a/lib/bin/check-migrations.js b/lib/bin/check-migrations.js
@@ -7,7 +7,7 @@
 // including this file, may be copied, modified, propagated, or distributed
 // except according to the terms contained in the LICENSE file.
 
-const { withKnex, checkMigrations } = require('../model/migrate');
+const { withKnex, checkMigrations } = require('../model/knex-migrator');
 
 (async () => {
   try {

diff --git a/lib/bin/check-open-db-queries.js b/lib/bin/check-open-db-queries.js
@@ -7,7 +7,7 @@
 // including this file, may be copied, modified, propagated, or distributed
 // except according to the terms contained in the LICENSE file.
 
-const { withKnex } = require('../model/migrate');
+const { withKnex } = require('../model/knex-migrator');
 
 (async () => {
   try {

diff --git a/lib/bin/run-migrations.js b/lib/bin/run-migrations.js
@@ -7,7 +7,7 @@
 // including this file, may be copied, modified, propagated, or distributed
 // except according to the terms contained in the LICENSE file.
 
-const { withKnex, migrate } = require('../model/migrate');
+const { withKnex, migrate } = require('../model/knex-migrator');
 
 (async () => {
   try {

diff --git a/lib/model/migrate.js → lib/model/knex-migrator.js b/lib/model/migrate.js → lib/model/knex-migrator.js
diff --git a/lib/model/migrations/20191231-02-add-schema-storage.js b/lib/model/migrations/20191231-02-add-schema-storage.js
@@ -51,7 +51,7 @@ const up = async (db) => {
               // this config hardcoding would be dangerous with tests except that
               // tests will never invoke this path.
               const config = require('config').get('default.database');
-              const db2 = require('../migrate').knexConnect(config); // eslint-disable-line no-restricted-modules
+              const db2 = require('../knex-migrator').knexConnect(config); // eslint-disable-line no-restricted-modules
               return db2.select('projectId', 'xmlFormId').from('forms').where({ currentDefId: formDefId })
                 .then(([{ projectId, xmlFormId }]) => {
                   process.stderr.write(`\n!!!!\nThe database upgrade to v0.8 has failed because the Form '${xmlFormId}' in Project ${projectId} has an invalid schema. It tries to bind multiple instance nodes at the path ${path}.\n!!!!\n\n`);

diff --git a/test/integration/other/migrations.js → test/integration/other/knex-migrations.js b/test/integration/other/migrations.js → test/integration/other/knex-migrations.js
@@ -6,7 +6,7 @@ const { testContainerFullTrx, testServiceFullTrx } = require('../setup');
 const { sql } = require('slonik');
 const { createReadStream } = require('fs');
 const { Actor, Config } = require(appRoot + '/lib/model/frames');
-const { withKnex } = require(appRoot + '/lib/model/migrate');
+const { withKnex } = require(appRoot + '/lib/model/knex-migrator');
 const { exhaust } = require(appRoot + '/lib/worker/worker');
 
 const testData = require('../../data/xml');

diff --git a/test/integration/setup.js b/test/integration/setup.js
@@ -12,7 +12,7 @@ const testData = require('../data/xml');
 
 // knex things.
 const config = require('config');
-const { knexConnect } = require(appRoot + '/lib/model/migrate');
+const { knexConnect } = require(appRoot + '/lib/model/knex-migrator');
 
 // slonik connection pool
 const { slonikPool } = require(appRoot + '/lib/external/slonik');