knex 2.3.0 → 2.4.1

package/scripts/oracledb-install-driver-libs.sh

@@ -1,82 +1,82 @@
-#!/usr/bin/env bash
-
-# Exit on error
-set -e
-
-# Directory constants
-repo_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." >/dev/null 2>&1 && pwd )"
-exec_dir="$( pwd )"
-script_dir="$repo_dir/scripts/"
-docker_compose_file="$repo_dir/scripts/docker-compose.yml"
-
-help_text="
-Helper script to install oracle drivers on local linux machine from Oracle
-database container.
-
-    oracledb-install-driver-libs.sh COMMAND
-
-    COMMAND:
-        run: Do the driver install.
-        dry-run: Do the driver install but do not save any files.
-        help: Print this menu.
-
-    NOTES FOR USAGE:
-    1. This script is tested to work on Ubuntu 18.04 LTS.
-    2. This script requires you to have sudo capabilities so to use ldconfig.
-"
-
-# Main script logic
-cmd="$1"
-
-function main () {
-    case "$1" in
-        "run")
-            printf "Starting run ...\n"
-            do_install true
-            exit 0
-            ;;
-        "dry-run")
-            printf "Starting dry-run ...\n"
-            do_install false
-            exit 0
-            ;;
-        "help"|"--help"|"-h"|"")
-            printf "$help_text"
-            exit 0
-            ;;
-        *)
-            printf "Unsupported command: $cmd\n"
-            printf "Try running with 'help' to see supported commands.\n"
-            exit 1
-            ;;
-    esac
-}
-
-function do_install () {
-    do_changes="$1"
-    printf "\nEnsuring oracle containers from docker-compose are up ...\n"
-    docker-compose -f "$docker_compose_file" up --build -d oracledb
-    docker-compose -f "$docker_compose_file" up waitoracledb
-    printf "\nSleeping an extra 15 seconds to ensure oracle has fully started ...\n"
-    sleep 15
-    printf "\nInstalling oracle client libs to db container ...\n"
-    set -x
-    docker-compose -f "$docker_compose_file" exec -T oracledb curl http://yum.oracle.com/public-yum-ol7.repo -o /etc/yum.repos.d/public-yum-ol7.repo
-    docker-compose -f "$docker_compose_file" exec -T oracledb yum install -y yum-utils
-    docker-compose -f "$docker_compose_file" exec -T oracledb yum-config-manager --enable ol7_oracle_instantclient
-    docker-compose -f "$docker_compose_file" exec -T oracledb yum install -y oracle-instantclient18.3-basiclite
-    set +x
-    printf "\nCopying to host's ~/lib directory and adding to ldconfig ...\n"
-    if [ "$do_changes" = "true" ]; then
-        set -x
-        docker cp oracledb_container:/usr/lib/oracle/18.3/client64/lib/ ~/
-        sudo sh -c "echo $HOME/lib > /etc/ld.so.conf.d/oracle-instantclient.conf"
-        sudo ldconfig
-        set +x
-    else
-        printf "(skipping because dry-run)\n"
-    fi
-}
-
-# Start the bash app's main function
-main "$cmd"
+#!/usr/bin/env bash
+
+# Exit on error
+set -e
+
+# Directory constants
+repo_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." >/dev/null 2>&1 && pwd )"
+exec_dir="$( pwd )"
+script_dir="$repo_dir/scripts/"
+docker_compose_file="$repo_dir/scripts/docker-compose.yml"
+
+help_text="
+Helper script to install oracle drivers on local linux machine from Oracle
+database container.
+
+    oracledb-install-driver-libs.sh COMMAND
+
+    COMMAND:
+        run: Do the driver install.
+        dry-run: Do the driver install but do not save any files.
+        help: Print this menu.
+
+    NOTES FOR USAGE:
+    1. This script is tested to work on Ubuntu 18.04 LTS.
+    2. This script requires you to have sudo capabilities so to use ldconfig.
+"
+
+# Main script logic
+cmd="$1"
+
+function main () {
+    case "$1" in
+        "run")
+            printf "Starting run ...\n"
+            do_install true
+            exit 0
+            ;;
+        "dry-run")
+            printf "Starting dry-run ...\n"
+            do_install false
+            exit 0
+            ;;
+        "help"|"--help"|"-h"|"")
+            printf "$help_text"
+            exit 0
+            ;;
+        *)
+            printf "Unsupported command: $cmd\n"
+            printf "Try running with 'help' to see supported commands.\n"
+            exit 1
+            ;;
+    esac
+}
+
+function do_install () {
+    do_changes="$1"
+    printf "\nEnsuring oracle containers from docker-compose are up ...\n"
+    docker-compose -f "$docker_compose_file" up --build -d oracledb
+    docker-compose -f "$docker_compose_file" up waitoracledb
+    printf "\nSleeping an extra 15 seconds to ensure oracle has fully started ...\n"
+    sleep 15
+    printf "\nInstalling oracle client libs to db container ...\n"
+    set -x
+    docker-compose -f "$docker_compose_file" exec -T oracledb curl http://yum.oracle.com/public-yum-ol7.repo -o /etc/yum.repos.d/public-yum-ol7.repo
+    docker-compose -f "$docker_compose_file" exec -T oracledb yum install -y yum-utils
+    docker-compose -f "$docker_compose_file" exec -T oracledb yum-config-manager --enable ol7_oracle_instantclient
+    docker-compose -f "$docker_compose_file" exec -T oracledb yum install -y oracle-instantclient18.3-basiclite
+    set +x
+    printf "\nCopying to host's ~/lib directory and adding to ldconfig ...\n"
+    if [ "$do_changes" = "true" ]; then
+        set -x
+        docker cp oracledb_container:/usr/lib/oracle/18.3/client64/lib/ ~/
+        sudo sh -c "echo $HOME/lib > /etc/ld.so.conf.d/oracle-instantclient.conf"
+        sudo ldconfig
+        set +x
+    else
+        printf "(skipping because dry-run)\n"
+    fi
+}
+
+# Start the bash app's main function
+main "$cmd"

package/scripts/release.sh

@@ -1,34 +1,34 @@
-#!/bin/bash -e
-
-changelog=node_modules/.bin/changelog
-
-update_version() {
-  echo "$(node -p "p=require('./${1}');p.version='${2}';JSON.stringify(p,null,2)")" > $1
-  echo "Updated ${1} version to ${2}"
-}
-
-current_version=$(node -p "require('./package').version")
-
-printf "Next version (current is $current_version)? "
-read next_version
-
-if ! [[ $next_version =~ ^[0-9]\.[0-9]+\.[0-9](-.+)? ]]; then
-  echo "Version must be a valid semver string, e.g. 1.0.2 or 2.3.0-beta.1"
-  exit 1
-fi
-
-next_ref="v$next_version"
-
-git add -u
-
-npm run build
-npm test
-
-update_version 'package.json' $next_version
-
-git commit -am "release $next_version"
-git tag $next_version
-
-git push --tags
-
-npm publish
+#!/bin/bash -e
+
+changelog=node_modules/.bin/changelog
+
+update_version() {
+  echo "$(node -p "p=require('./${1}');p.version='${2}';JSON.stringify(p,null,2)")" > $1
+  echo "Updated ${1} version to ${2}"
+}
+
+current_version=$(node -p "require('./package').version")
+
+printf "Next version (current is $current_version)? "
+read next_version
+
+if ! [[ $next_version =~ ^[0-9]\.[0-9]+\.[0-9](-.+)? ]]; then
+  echo "Version must be a valid semver string, e.g. 1.0.2 or 2.3.0-beta.1"
+  exit 1
+fi
+
+next_ref="v$next_version"
+
+git add -u
+
+npm run build
+npm test
+
+update_version 'package.json' $next_version
+
+git commit -am "release $next_version"
+git tag $next_version
+
+git push --tags
+
+npm publish

package/scripts/runkit-example.js

@@ -1,34 +1,34 @@
-require('sqlite3');
-const Knex = require('knex');
-
-const knexSqlite = Knex({
-  client: 'sqlite',
-  connection: ':memory:',
-});
-
-const knexMysql = Knex({
-  client: 'mysql2',
-});
-
-const knexPg = Knex({
-  client: 'pg',
-});
-
-(async function run() {
-  await knexSqlite.schema.createTable('test', (t) => {
-    t.increments('id').primary();
-    t.string('data');
-  });
-
-  await knexSqlite('test').insert([{ data: 'foo' }, { data: 'bar' }]);
-
-  console.log('test table data:', await knexSqlite('test'));
-
-  console.log(
-    knexPg({ f: 'foo', b: 'bar' })
-      .select('foo.*')
-      .where('f.name', knexPg.raw('??', ['b.name']))
-      .whereIn('something', knexPg('bar').select('id'))
-      .toSQL().sql
-  );
-})();
+require('sqlite3');
+const Knex = require('knex');
+
+const knexSqlite = Knex({
+  client: 'sqlite',
+  connection: ':memory:',
+});
+
+const knexMysql = Knex({
+  client: 'mysql2',
+});
+
+const knexPg = Knex({
+  client: 'pg',
+});
+
+(async function run() {
+  await knexSqlite.schema.createTable('test', (t) => {
+    t.increments('id').primary();
+    t.string('data');
+  });
+
+  await knexSqlite('test').insert([{ data: 'foo' }, { data: 'bar' }]);
+
+  console.log('test table data:', await knexSqlite('test'));
+
+  console.log(
+    knexPg({ f: 'foo', b: 'bar' })
+      .select('foo.*')
+      .where('f.name', knexPg.raw('??', ['b.name']))
+      .whereIn('something', knexPg('bar').select('id'))
+      .toSQL().sql
+  );
+})();

package/scripts/stress-test/README.txt

@@ -1,18 +1,18 @@
-# Test scripts to evaluate stability of drivers / pool etc.
-
-# To run this test you need to be in this directory + have node >= 8
-# and startup docker containers with proxy and sql servers
-
-docker-compose up --no-start
-docker-compose start
-
-# Select different test script to run:
-
-node mysql2-random-hanging-every-now-and-then.js 2> /dev/null | grep -B500 -A2 -- "- STATS" 
-node mysql2-sudden-exit-without-error
-node knex-stress-test.js | grep -A 3 -- "- STATS "
-node reconnect-test-mysql-based-drivers.js 2> /dev/null | grep -A 3 -- "- STATS "
-
-# Shut down docker instances when done:
-
-docker-compose down
+# Test scripts to evaluate stability of drivers / pool etc.
+
+# To run this test you need to be in this directory + have node >= 8
+# and startup docker containers with proxy and sql servers
+
+docker-compose up --no-start
+docker-compose start
+
+# Select different test script to run:
+
+node mysql2-random-hanging-every-now-and-then.js 2> /dev/null | grep -B500 -A2 -- "- STATS" 
+node mysql2-sudden-exit-without-error
+node knex-stress-test.js | grep -A 3 -- "- STATS "
+node reconnect-test-mysql-based-drivers.js 2> /dev/null | grep -A 3 -- "- STATS "
+
+# Shut down docker instances when done:
+
+docker-compose down

package/scripts/stress-test/docker-compose.yml

@@ -1,57 +1,57 @@
-version: '3'
-
-services:
-  toxiproxy:
-    image: shopify/toxiproxy
-    ports:
-      - "8474:8474"
-      - "23306:23306"
-      - "25432:25432"
-      - "25433:25433"
-      - "21521:21521"
-      - "21433:21433"
-    links:
-      - "mysql"
-      - "postgresql"
-      - "pgnative"
-      - "oracledb"
-      - "mssql"
-
-  mysql:
-    image: mysql:5.7
-    ports:
-      - "33306:3306"
-    environment:
-      - TZ=UTC
-      - MYSQL_ROOT_PASSWORD=mysqlrootpassword
-
-  postgresql:
-    image: mdillon/postgis
-    ports:
-      - "35432:5432"
-    environment:
-      - POSTGRES_PASSWORD=postgresrootpassword
-      - POSTGRES_USER=postgres
-
-  pgnative:
-    image: mdillon/postgis
-    ports:
-      - "35433:5432"
-    environment:
-      - POSTGRES_PASSWORD=postgresrootpassword
-      - POSTGRES_USER=postgres
-
-  oracledb:
-    image: quillbuilduser/oracle-18-xe
-    ports:
-      - "31521:1521"
-    environment:
-      - ORACLE_ALLOW_REMOTE=true
-
-  mssql:
-    image: microsoft/mssql-server-linux:2017-latest
-    ports:
-      - "31433:1433"
-    environment:
-      - ACCEPT_EULA=Y
-      - SA_PASSWORD=S0meVeryHardPassword
+version: '3'
+
+services:
+  toxiproxy:
+    image: shopify/toxiproxy
+    ports:
+      - "8474:8474"
+      - "23306:23306"
+      - "25432:25432"
+      - "25433:25433"
+      - "21521:21521"
+      - "21433:21433"
+    links:
+      - "mysql"
+      - "postgresql"
+      - "pgnative"
+      - "oracledb"
+      - "mssql"
+
+  mysql:
+    image: mysql:5.7
+    ports:
+      - "33306:3306"
+    environment:
+      - TZ=UTC
+      - MYSQL_ROOT_PASSWORD=mysqlrootpassword
+
+  postgresql:
+    image: mdillon/postgis
+    ports:
+      - "35432:5432"
+    environment:
+      - POSTGRES_PASSWORD=postgresrootpassword
+      - POSTGRES_USER=postgres
+
+  pgnative:
+    image: mdillon/postgis
+    ports:
+      - "35433:5432"
+    environment:
+      - POSTGRES_PASSWORD=postgresrootpassword
+      - POSTGRES_USER=postgres
+
+  oracledb:
+    image: quillbuilduser/oracle-18-xe
+    ports:
+      - "31521:1521"
+    environment:
+      - ORACLE_ALLOW_REMOTE=true
+
+  mssql:
+    image: microsoft/mssql-server-linux:2017-latest
+    ports:
+      - "31433:1433"
+    environment:
+      - ACCEPT_EULA=Y
+      - SA_PASSWORD=S0meVeryHardPassword