From 4b0966f857388ce5bfbd1ff04d51284647df593e Mon Sep 17 00:00:00 2001 From: Pitu Date: Fri, 5 Apr 2019 06:05:21 +0000 Subject: [PATCH] Ditched sqlite. Use postgres or mysql/mariadb --- knexfile.js | 6 ++--- package.json | 2 +- src/api/structures/Route.js | 7 ++---- src/wizard.js | 2 +- yarn.lock | 50 +++++++++++++++---------------------- 5 files changed, 26 insertions(+), 41 deletions(-) diff --git a/knexfile.js b/knexfile.js index 0342bbf..e92fe20 100644 --- a/knexfile.js +++ b/knexfile.js @@ -6,8 +6,7 @@ module.exports = { host: process.env.DB_HOST, user: process.env.DB_USER, password: process.env.DB_PASSWORD, - database: process.env.DB_DATABASE, - filename: 'database.sqlite' + database: process.env.DB_DATABASE }, pool: { min: process.env.DATABASE_POOL_MIN || 2, @@ -18,6 +17,5 @@ module.exports = { }, seeds: { directory: 'src/api/database/seeds' - }, - useNullAsDefault: process.env.DB_CLIENT === 'sqlite' ? true : false + } }; diff --git a/package.json b/package.json index 42a99eb..6d79b11 100644 --- a/package.json +++ b/package.json @@ -55,6 +55,7 @@ "knex": "^0.16.3", "moment": "^2.24.0", "multer": "^1.4.1", + "mysql": "^2.16.0", "nuxt": "^2.4.3", "nuxt-dropzone": "^0.2.8", "one-liner": "^1.3.0", @@ -64,7 +65,6 @@ "randomstring": "^1.1.5", "serve-static": "^1.13.2", "sharp": "^0.21.3", - "sqlite3": "^4.0.6", "uuid": "^3.3.2", "v-clipboard": "^2.2.1", "vue-axios": "^2.1.4", diff --git a/src/api/structures/Route.js b/src/api/structures/Route.js index 8a73454..960dc4b 100644 --- a/src/api/structures/Route.js +++ b/src/api/structures/Route.js @@ -1,4 +1,3 @@ -const nodePath = require('path'); const JWT = require('jsonwebtoken'); const db = require('knex')({ client: process.env.DB_CLIENT, @@ -6,10 +5,8 @@ const db = require('knex')({ host: process.env.DB_HOST, user: process.env.DB_USER, password: process.env.DB_PASSWORD, - database: process.env.DB_DATABASE, - filename: nodePath.join(__dirname, '..', '..', '..', 'database.sqlite') - }, - useNullAsDefault: process.env.DB_CLIENT === 'sqlite' ? true : false + database: process.env.DB_DATABASE + } }); const moment = require('moment'); const log = require('../utils/Log'); diff --git a/src/wizard.js b/src/wizard.js index e7efb61..00e023c 100644 --- a/src/wizard.js +++ b/src/wizard.js @@ -106,7 +106,7 @@ async function start() { symbol: '>', menu: [ 'pg', - 'sqlite3' + 'mysql' ] }, { diff --git a/yarn.lock b/yarn.lock index 250d0ab..42e3ba9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1559,6 +1559,11 @@ big.js@^5.2.2: resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ== +bignumber.js@4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-4.1.0.tgz#db6f14067c140bd46624815a7916c92d9b6c24b1" + integrity sha512-eJzYkFYy9L4JzXsbymsFn3p54D+llV27oTQ+ziJG7WFRheJcNZilgVXMG0LoZtlQSKBsJdWtLFqOD0u+U0jZKA== + binary-extensions@^1.0.0: version "1.13.0" resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.0.tgz#9523e001306a32444b907423f1de2164222f6ab1" @@ -5401,16 +5406,21 @@ mute-stream@0.0.7: resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s= +mysql@^2.16.0: + version "2.16.0" + resolved "https://registry.yarnpkg.com/mysql/-/mysql-2.16.0.tgz#b23b22ab5de44fc2d5d32bd4f5af6653fc45e2ba" + integrity sha512-dPbN2LHonQp7D5ja5DJXNbCLe/HRdu+f3v61aguzNRQIrmZLOeRoymBYyeThrR6ug+FqzDL95Gc9maqZUJS+Gw== + dependencies: + bignumber.js "4.1.0" + readable-stream "2.3.6" + safe-buffer "5.1.2" + sqlstring "2.3.1" + nan@2.12.1, nan@^2.10.0, nan@^2.12.1, nan@^2.9.2: version "2.12.1" resolved "https://registry.yarnpkg.com/nan/-/nan-2.12.1.tgz#7b1aa193e9aa86057e3c7bbd0ac448e770925552" integrity sha512-JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw== -nan@~2.10.0: - version "2.10.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f" - integrity sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA== - nanomatch@^1.2.9: version "1.2.13" resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" @@ -5570,22 +5580,6 @@ node-pre-gyp@^0.10.0: semver "^5.3.0" tar "^4" -node-pre-gyp@^0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.11.0.tgz#db1f33215272f692cd38f03238e3e9b47c5dd054" - integrity sha512-TwWAOZb0j7e9eGaf9esRx3ZcLaE5tQ2lvYy1pb5IAaG1a2e2Kv5Lms1Y4hpj+ciXJRofIxxlt5haeQ/2ANeE0Q== - dependencies: - detect-libc "^1.0.2" - mkdirp "^0.5.1" - needle "^2.2.1" - nopt "^4.0.1" - npm-packlist "^1.1.6" - npmlog "^4.0.2" - rc "^1.2.7" - rimraf "^2.6.1" - semver "^5.3.0" - tar "^4" - node-releases@^1.1.3: version "1.1.7" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.7.tgz#b09a10394d0ed8f7778f72bb861dde68b146303b" @@ -7154,7 +7148,7 @@ read-pkg@^1.0.0: normalize-package-data "^2.3.2" path-type "^1.0.0" -"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6: +"readable-stream@1 || 2", readable-stream@2.3.6, readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6: version "2.3.6" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw== @@ -7874,14 +7868,10 @@ sprintf-js@~1.0.2: resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= -sqlite3@^4.0.6: - version "4.0.6" - resolved "https://registry.yarnpkg.com/sqlite3/-/sqlite3-4.0.6.tgz#e587b583b5acc6cb38d4437dedb2572359c080ad" - integrity sha512-EqBXxHdKiwvNMRCgml86VTL5TK1i0IKiumnfxykX0gh6H6jaKijAXvE9O1N7+omfNSawR2fOmIyJZcfe8HYWpw== - dependencies: - nan "~2.10.0" - node-pre-gyp "^0.11.0" - request "^2.87.0" +sqlstring@2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/sqlstring/-/sqlstring-2.3.1.tgz#475393ff9e91479aea62dcaf0ca3d14983a7fb40" + integrity sha1-R1OT/56RR5rqYtyvDKPRSYOn+0A= sshpk@^1.7.0: version "1.16.1"