knex 2.4.1 → 2.4.2

package/scripts/build.js

@@ -1,125 +1,125 @@
-#!/usr/bin/env node
-const fs = require('fs');
-const path = require('path');
-const child_process = require('child_process');
-const _ = require('lodash');
-
-const exec = function (cmd, args) {
-  return new Promise(function (resolve, reject) {
-    // Execute command
-    const child = child_process.exec(cmd, {
-      cwd: process.cwd(),
-      env: process.env,
-    });
-
-    // Pass stdout and stderr
-    child.stdout.on('data', function (data) {
-      process.stdout.write(data.toString());
-    });
-    child.stderr.on('data', function (data) {
-      process.stderr.write(data.toString());
-    });
-    // Handle result
-    child.on('exit', function (code) {
-      if (code) reject(code);
-      else resolve();
-    });
-    child.on('error', reject);
-  });
-};
-
-const CWD = process.cwd();
-const POSTINSTALL_BUILD_CWD = process.env.POSTINSTALL_BUILD_CWD;
-
-// If we didn't have this check, then we'd be stuck in an infinite `postinstall`
-// loop, since we run `npm install --only=dev` below, triggering another
-// `postinstall`. We can't use `--ignore-scripts` because that ignores scripts
-// on all the modules that get installed, too, which would break stuff. So
-// instead, we set an environment variable, `POSTINSTALL_BUILD_CWD`, that keeps
-// track of what we're installing. It's more than just a yes/no flag because
-// the dev dependencies we're installing might use `postinstall-build` too, and
-// we don't want the flag to prevent them from running.
-if (POSTINSTALL_BUILD_CWD !== CWD) {
-  const BUILD_ARTIFACT = process.argv[2];
-  const BUILD_COMMAND = process.argv[3];
-
-  fs.stat(BUILD_ARTIFACT, function (err, stats) {
-    if (err || !(stats.isFile() || stats.isDirectory())) {
-      // This script will run again after we run `npm install` below. Set an
-      // environment variable to tell it to skip the check. Really we just want
-      // the execSync's `env` to be modified, but it's easier just modify and
-      // pass along the entire `process.env`.
-      process.env.POSTINSTALL_BUILD_CWD = CWD;
-      // We already have prod dependencies, that's what triggered `postinstall`
-      // in the first place. So only install dev.
-
-      // Fetch package.json
-      const pkgJson = require(path.join(CWD, 'package.json'));
-      const devDeps = pkgJson.devDependencies;
-      // Values listed under `buildDependencies` contain the dependency names
-      // that are required for `lib` building.
-      const buildDependencies = _.pick(devDeps, pkgJson.buildDependencies);
-
-      // Proceed only if there is something to install
-      if (!_.isEmpty(buildDependencies)) {
-        const opts = { env: process.env, stdio: 'inherit' };
-
-        console.log('Building Knex.js');
-
-        // Map all key (dependency) value (semver) pairs to
-        // "dependency@semver dependency@semver ..." string that can be used
-        // for `npm install` command
-        const installArgs = _(buildDependencies)
-          .pickBy(function (semver, dep) {
-            // Check if the dependency is already installed
-            try {
-              require(dep);
-              return false;
-            } catch (err) {
-              return true;
-            }
-          })
-          .map(function (semver, dep) {
-            // Format installable dependencies
-            return dep + '@' + semver;
-          })
-          .value()
-          .join(' ');
-        const needsDepInstallation = !_.isEmpty(installArgs);
-        const dependenciesInstalledQ = needsDepInstallation
-          ? exec('npm install ' + installArgs, opts)
-          : Promise.resolve();
-        dependenciesInstalledQ
-          .then(function () {
-            console.log('✓');
-            // Don't need the flag anymore as `postinstall` was already run.
-            // Change it back so the environment is minimally changed for the
-            // remaining commands.
-            process.env.POSTINSTALL_BUILD_CWD = POSTINSTALL_BUILD_CWD;
-            console.log('Building compiled files (' + BUILD_COMMAND + ')');
-            return exec(BUILD_COMMAND, opts);
-          })
-          .catch(function (err) {
-            console.error(err);
-            process.exit(1);
-          })
-          .then(function () {
-            if (process.env.NODE_ENV === 'production') {
-              console.log('✓');
-              console.log('Pruning dev dependencies for production build');
-              return exec('npm prune --production', opts);
-            } else {
-              console.log('Skipping npm prune');
-            }
-          })
-          .then(function () {
-            console.log('✓');
-          })
-          .catch(function (err) {
-            console.error(err);
-            process.exit(1);
-          });
-      }
-    }
-  });
-}
+#!/usr/bin/env node
+const fs = require('fs');
+const path = require('path');
+const child_process = require('child_process');
+const _ = require('lodash');
+
+const exec = function (cmd, args) {
+  return new Promise(function (resolve, reject) {
+    // Execute command
+    const child = child_process.exec(cmd, {
+      cwd: process.cwd(),
+      env: process.env,
+    });
+
+    // Pass stdout and stderr
+    child.stdout.on('data', function (data) {
+      process.stdout.write(data.toString());
+    });
+    child.stderr.on('data', function (data) {
+      process.stderr.write(data.toString());
+    });
+    // Handle result
+    child.on('exit', function (code) {
+      if (code) reject(code);
+      else resolve();
+    });
+    child.on('error', reject);
+  });
+};
+
+const CWD = process.cwd();
+const POSTINSTALL_BUILD_CWD = process.env.POSTINSTALL_BUILD_CWD;
+
+// If we didn't have this check, then we'd be stuck in an infinite `postinstall`
+// loop, since we run `npm install --only=dev` below, triggering another
+// `postinstall`. We can't use `--ignore-scripts` because that ignores scripts
+// on all the modules that get installed, too, which would break stuff. So
+// instead, we set an environment variable, `POSTINSTALL_BUILD_CWD`, that keeps
+// track of what we're installing. It's more than just a yes/no flag because
+// the dev dependencies we're installing might use `postinstall-build` too, and
+// we don't want the flag to prevent them from running.
+if (POSTINSTALL_BUILD_CWD !== CWD) {
+  const BUILD_ARTIFACT = process.argv[2];
+  const BUILD_COMMAND = process.argv[3];
+
+  fs.stat(BUILD_ARTIFACT, function (err, stats) {
+    if (err || !(stats.isFile() || stats.isDirectory())) {
+      // This script will run again after we run `npm install` below. Set an
+      // environment variable to tell it to skip the check. Really we just want
+      // the execSync's `env` to be modified, but it's easier just modify and
+      // pass along the entire `process.env`.
+      process.env.POSTINSTALL_BUILD_CWD = CWD;
+      // We already have prod dependencies, that's what triggered `postinstall`
+      // in the first place. So only install dev.
+
+      // Fetch package.json
+      const pkgJson = require(path.join(CWD, 'package.json'));
+      const devDeps = pkgJson.devDependencies;
+      // Values listed under `buildDependencies` contain the dependency names
+      // that are required for `lib` building.
+      const buildDependencies = _.pick(devDeps, pkgJson.buildDependencies);
+
+      // Proceed only if there is something to install
+      if (!_.isEmpty(buildDependencies)) {
+        const opts = { env: process.env, stdio: 'inherit' };
+
+        console.log('Building Knex.js');
+
+        // Map all key (dependency) value (semver) pairs to
+        // "dependency@semver dependency@semver ..." string that can be used
+        // for `npm install` command
+        const installArgs = _(buildDependencies)
+          .pickBy(function (semver, dep) {
+            // Check if the dependency is already installed
+            try {
+              require(dep);
+              return false;
+            } catch (err) {
+              return true;
+            }
+          })
+          .map(function (semver, dep) {
+            // Format installable dependencies
+            return dep + '@' + semver;
+          })
+          .value()
+          .join(' ');
+        const needsDepInstallation = !_.isEmpty(installArgs);
+        const dependenciesInstalledQ = needsDepInstallation
+          ? exec('npm install ' + installArgs, opts)
+          : Promise.resolve();
+        dependenciesInstalledQ
+          .then(function () {
+            console.log('✓');
+            // Don't need the flag anymore as `postinstall` was already run.
+            // Change it back so the environment is minimally changed for the
+            // remaining commands.
+            process.env.POSTINSTALL_BUILD_CWD = POSTINSTALL_BUILD_CWD;
+            console.log('Building compiled files (' + BUILD_COMMAND + ')');
+            return exec(BUILD_COMMAND, opts);
+          })
+          .catch(function (err) {
+            console.error(err);
+            process.exit(1);
+          })
+          .then(function () {
+            if (process.env.NODE_ENV === 'production') {
+              console.log('✓');
+              console.log('Pruning dev dependencies for production build');
+              return exec('npm prune --production', opts);
+            } else {
+              console.log('Skipping npm prune');
+            }
+          })
+          .then(function () {
+            console.log('✓');
+          })
+          .catch(function (err) {
+            console.error(err);
+            process.exit(1);
+          });
+      }
+    }
+  });
+}

package/scripts/clean.js

@@ -1,29 +1,31 @@
-#!/usr/bin/env node
-
-const fs = require('fs')
-const path = require('path')
-const { execSync } = require("child_process");
-
-function main() {
-  const repoDir = path.dirname(__dirname)
-  const gitDir = path.join(repoDir, '.git')
-  const gitDirExists = doesDirectoryExist(gitDir)
-  if (!gitDirExists) {
-    console.log("No .git directory detected so can not clean 'lib/'. Exiting.")
-    process.exit(0)
-  }
-  console.log("Cleaning 'lib/' of outputted files from Typescript compilation ...")
-  const cmd = 'git clean -f -X lib/'
-  const output = execSync(cmd, { cwd: repoDir })
-  console.log(output.toString('utf8'))
-  console.log('Done')
-}
-
-function doesDirectoryExist(p) {
-  if (fs.existsSync(p)) {
-    return fs.lstatSync(p).isDirectory()
-  }
-  return false
-}
-
-main()
+#!/usr/bin/env node
+
+const fs = require('fs');
+const path = require('path');
+const { execSync } = require('child_process');
+
+function main() {
+  const repoDir = path.dirname(__dirname);
+  const gitDir = path.join(repoDir, '.git');
+  const gitDirExists = doesDirectoryExist(gitDir);
+  if (!gitDirExists) {
+    console.log("No .git directory detected so can not clean 'lib/'. Exiting.");
+    process.exit(0);
+  }
+  console.log(
+    "Cleaning 'lib/' of outputted files from Typescript compilation ..."
+  );
+  const cmd = 'git clean -f -X lib/';
+  const output = execSync(cmd, { cwd: repoDir });
+  console.log(output.toString('utf8'));
+  console.log('Done');
+}
+
+function doesDirectoryExist(p) {
+  if (fs.existsSync(p)) {
+    return fs.lstatSync(p).isDirectory();
+  }
+  return false;
+}
+
+main();

package/scripts/docker-compose.yml

@@ -1,152 +1,152 @@
-version: '3'
-
-services:
-  mssql:
-    image: mcr.microsoft.com/mssql/server:2019-latest
-    ports:
-      - '21433:1433'
-    environment:
-      - ACCEPT_EULA=Y
-      - SA_PASSWORD=S0meVeryHardPassword
-    healthcheck:
-      test: /opt/mssql-tools/bin/sqlcmd -S mssql -U sa -P 'S0meVeryHardPassword' -Q 'select 1'
-  waitmssql:
-    image: mcr.microsoft.com/mssql/server:2017-latest
-    links:
-      - mssql
-    depends_on:
-      - mssql
-    entrypoint:
-      - bash
-      - -c
-      # https://docs.microsoft.com/en-us/sql/relational-databases/logs/control-transaction-durability?view=sql-server-ver15#bkmk_DbControl
-      - 'until /opt/mssql-tools/bin/sqlcmd -S mssql -U sa -P S0meVeryHardPassword -d master -Q "CREATE DATABASE knex_test; ALTER DATABASE knex_test SET ALLOW_SNAPSHOT_ISOLATION ON; ALTER DATABASE knex_test SET DELAYED_DURABILITY = FORCED"; do sleep 5; done'
-
-  mysql:
-    image: mysql
-    # https://dev.mysql.com/doc/refman/8.0/en/mysql-acid.html
-    # https://dev.mysql.com/doc/refman/8.0/en/innodb-parameters.html#sysvar_innodb_flush_method
-    # nosync only for unix, edit for local start on other systems
-    command: --default-authentication-plugin=mysql_native_password --sync_binlog=0 --innodb_doublewrite=OFF  --innodb-flush-log-at-trx-commit=0 --innodb-flush-method=nosync
-    ports:
-      - '23306:3306'
-    environment:
-      - MYSQL_ROOT_PASSWORD=testrootpassword
-      - MYSQL_DATABASE=knex_test
-      - MYSQL_USER=testuser
-      - MYSQL_PASSWORD=testpassword
-    healthcheck:
-      test:
-        [
-          'CMD',
-          '/usr/bin/mysql',
-          '-hlocalhost',
-          '-utestuser',
-          '-ptestpassword',
-          '-e',
-          'SELECT 1',
-        ]
-      interval: 30s
-      timeout: 5s
-      retries: 3
-    restart: always
-    volumes:
-      - mysql_data:/var/lib/mysql
-  waitmysql:
-    image: mysql
-    links:
-      - mysql
-    depends_on:
-      - mysql
-    entrypoint:
-      - bash
-      - -c
-      - 'until /usr/bin/mysql -hmysql -utestuser -ptestpassword -e "SELECT 1"; do sleep 5; done'
-
-  postgres:
-    image: postgres:13-alpine
-    # see https://www.postgresql.org/docs/current/non-durability.html
-    command: '-c full_page_writes=off -c fsync=off -c synchronous_commit=off'
-    ports:
-      - '25432:5432'
-    environment:
-      - POSTGRES_USER=testuser
-      - POSTGRES_PASSWORD=knextest
-      - POSTGRES_DB=knex_test
-  waitpostgres:
-    image: postgres:13-alpine
-    links:
-      - postgres
-    depends_on:
-      - postgres
-    entrypoint:
-      - bash
-      - -c
-      - 'until /usr/local/bin/psql postgres://testuser:knextest@postgres/knex_test -c "SELECT 1"; do sleep 5; done'
-
-  cockroachdb:
-    image: cockroachdb/cockroach:latest-v21.2
-    container_name: crdb
-    hostname: crdb
-    command: start-single-node --cluster-name=example-single-node --insecure
-    ports:
-      - "26257:26257"
-      - "8080:8080"
-
-  waitcockroachdb:
-    container_name: crdb-init
-    hostname: crdb-init
-    image: timveil/cockroachdb-remote-client:latest
-    environment:
-      - COCKROACH_HOST=crdb:26257
-      - COCKROACH_INSECURE=true
-      - DATABASE_NAME=test
-    depends_on:
-      - cockroachdb
-
-  pgnative:
-    image: postgres:13-alpine
-    # see https://www.postgresql.org/docs/current/non-durability.html
-    command: '-c full_page_writes=off -c fsync=off -c synchronous_commit=off'
-    ports:
-      - '25433:5432'
-    environment:
-      - POSTGRES_USER=testuser
-      - POSTGRES_PASSWORD=knextest
-      - POSTGRES_DB=knex_test
-  waitpgnative:
-    image: postgres:13-alpine
-    links:
-      - pgnative
-    depends_on:
-      - pgnative
-    entrypoint:
-      - bash
-      - -c
-      - 'until /usr/local/bin/psql postgres://testuser:knextest@pgnative/knex_test -c "SELECT 1"; do sleep 5; done'
-
-  oracledb:
-    image: quillbuilduser/oracle-18-xe
-    container_name: oracledb_container
-    ports:
-      - '21521:1521'
-    environment:
-      - ORACLE_ALLOW_REMOTE=true
-  waitoracledb:
-    image: quillbuilduser/oracle-18-xe
-    links:
-      - oracledb
-    depends_on:
-      - oracledb
-    environment:
-      - ORACLE_HOME=/opt/oracle/product/18c/dbhomeXE
-    entrypoint:
-      - bash
-      - -c
-      - 'until /opt/oracle/product/18c/dbhomeXE/bin/sqlplus -s sys/Oracle18@oracledb/XE as sysdba <<< "SELECT 13376411 FROM DUAL; exit;" | grep "13376411"; do echo "Could not connect to oracle... sleep for a while"; sleep 5; done'
-
-volumes:
-  mysql_data:
-    driver_opts:
-      type: tmpfs
-      device: tmpfs
+version: '3'
+
+services:
+  mssql:
+    image: mcr.microsoft.com/mssql/server:2019-latest
+    ports:
+      - '21433:1433'
+    environment:
+      - ACCEPT_EULA=Y
+      - SA_PASSWORD=S0meVeryHardPassword
+    healthcheck:
+      test: /opt/mssql-tools/bin/sqlcmd -S mssql -U sa -P 'S0meVeryHardPassword' -Q 'select 1'
+  waitmssql:
+    image: mcr.microsoft.com/mssql/server:2017-latest
+    links:
+      - mssql
+    depends_on:
+      - mssql
+    entrypoint:
+      - bash
+      - -c
+      # https://docs.microsoft.com/en-us/sql/relational-databases/logs/control-transaction-durability?view=sql-server-ver15#bkmk_DbControl
+      - 'until /opt/mssql-tools/bin/sqlcmd -S mssql -U sa -P S0meVeryHardPassword -d master -Q "CREATE DATABASE knex_test; ALTER DATABASE knex_test SET ALLOW_SNAPSHOT_ISOLATION ON; ALTER DATABASE knex_test SET DELAYED_DURABILITY = FORCED"; do sleep 5; done'
+
+  mysql:
+    image: mysql
+    # https://dev.mysql.com/doc/refman/8.0/en/mysql-acid.html
+    # https://dev.mysql.com/doc/refman/8.0/en/innodb-parameters.html#sysvar_innodb_flush_method
+    # nosync only for unix, edit for local start on other systems
+    command: --default-authentication-plugin=mysql_native_password --sync_binlog=0 --innodb_doublewrite=OFF  --innodb-flush-log-at-trx-commit=0 --innodb-flush-method=nosync
+    ports:
+      - '23306:3306'
+    environment:
+      - MYSQL_ROOT_PASSWORD=testrootpassword
+      - MYSQL_DATABASE=knex_test
+      - MYSQL_USER=testuser
+      - MYSQL_PASSWORD=testpassword
+    healthcheck:
+      test:
+        [
+          'CMD',
+          '/usr/bin/mysql',
+          '-hlocalhost',
+          '-utestuser',
+          '-ptestpassword',
+          '-e',
+          'SELECT 1',
+        ]
+      interval: 30s
+      timeout: 5s
+      retries: 3
+    restart: always
+    volumes:
+      - mysql_data:/var/lib/mysql
+  waitmysql:
+    image: mysql
+    links:
+      - mysql
+    depends_on:
+      - mysql
+    entrypoint:
+      - bash
+      - -c
+      - 'until /usr/bin/mysql -hmysql -utestuser -ptestpassword -e "SELECT 1"; do sleep 5; done'
+
+  postgres:
+    image: postgres:13-alpine
+    # see https://www.postgresql.org/docs/current/non-durability.html
+    command: '-c full_page_writes=off -c fsync=off -c synchronous_commit=off'
+    ports:
+      - '25432:5432'
+    environment:
+      - POSTGRES_USER=testuser
+      - POSTGRES_PASSWORD=knextest
+      - POSTGRES_DB=knex_test
+  waitpostgres:
+    image: postgres:13-alpine
+    links:
+      - postgres
+    depends_on:
+      - postgres
+    entrypoint:
+      - bash
+      - -c
+      - 'until /usr/local/bin/psql postgres://testuser:knextest@postgres/knex_test -c "SELECT 1"; do sleep 5; done'
+
+  cockroachdb:
+    image: cockroachdb/cockroach:latest-v21.2
+    container_name: crdb
+    hostname: crdb
+    command: start-single-node --cluster-name=example-single-node --insecure
+    ports:
+      - "26257:26257"
+      - "8080:8080"
+
+  waitcockroachdb:
+    container_name: crdb-init
+    hostname: crdb-init
+    image: timveil/cockroachdb-remote-client:latest
+    environment:
+      - COCKROACH_HOST=crdb:26257
+      - COCKROACH_INSECURE=true
+      - DATABASE_NAME=test
+    depends_on:
+      - cockroachdb
+
+  pgnative:
+    image: postgres:13-alpine
+    # see https://www.postgresql.org/docs/current/non-durability.html
+    command: '-c full_page_writes=off -c fsync=off -c synchronous_commit=off'
+    ports:
+      - '25433:5432'
+    environment:
+      - POSTGRES_USER=testuser
+      - POSTGRES_PASSWORD=knextest
+      - POSTGRES_DB=knex_test
+  waitpgnative:
+    image: postgres:13-alpine
+    links:
+      - pgnative
+    depends_on:
+      - pgnative
+    entrypoint:
+      - bash
+      - -c
+      - 'until /usr/local/bin/psql postgres://testuser:knextest@pgnative/knex_test -c "SELECT 1"; do sleep 5; done'
+
+  oracledb:
+    image: quillbuilduser/oracle-18-xe
+    container_name: oracledb_container
+    ports:
+      - '21521:1521'
+    environment:
+      - ORACLE_ALLOW_REMOTE=true
+  waitoracledb:
+    image: quillbuilduser/oracle-18-xe
+    links:
+      - oracledb
+    depends_on:
+      - oracledb
+    environment:
+      - ORACLE_HOME=/opt/oracle/product/18c/dbhomeXE
+    entrypoint:
+      - bash
+      - -c
+      - 'until /opt/oracle/product/18c/dbhomeXE/bin/sqlplus -s sys/Oracle18@oracledb/XE as sysdba <<< "SELECT 13376411 FROM DUAL; exit;" | grep "13376411"; do echo "Could not connect to oracle... sleep for a while"; sleep 5; done'
+
+volumes:
+  mysql_data:
+    driver_opts:
+      type: tmpfs
+      device: tmpfs

package/scripts/next-release-howto.md

@@ -1,24 +1,24 @@
-# Checklist for crating knex @next releases
-
-1. Go through all commits since the last release and add them to CHANGELOG.md under unreleased changes section.
-2. Commit changes to CHANGELOG
-3. Check that master compiles and tests are running fine (check also that CI tests are passing)
-
-```sh
-      npm run build
-
-      # run bunch of tests, but skipping coverage which doesn't really work locally at least
-      npm plaintest
-      npm bin_test
-      npm oracledb:test
-      npm mssql:init
-      npm mssql:test
-      npm mssql:destroy
-```
-
-4. Update package.json version to be e.g. 0.16.0-next1 or 0.16.0-next2 and commit yo master
-5. Publish it under @next tag 
-
-```sh
-      npm publish --tag next
-```
+# Checklist for crating knex @next releases
+
+1. Go through all commits since the last release and add them to CHANGELOG.md under unreleased changes section.
+2. Commit changes to CHANGELOG
+3. Check that master compiles and tests are running fine (check also that CI tests are passing)
+
+```sh
+      npm run build
+
+      # run bunch of tests, but skipping coverage which doesn't really work locally at least
+      npm plaintest
+      npm bin_test
+      npm oracledb:test
+      npm mssql:init
+      npm mssql:test
+      npm mssql:destroy
+```
+
+4. Update package.json version to be e.g. 0.16.0-next1 or 0.16.0-next2 and commit yo master
+5. Publish it under @next tag 
+
+```sh
+      npm publish --tag next
+```