From 118700f38b00ab6367c0253c059252c9f69f87f2 Mon Sep 17 00:00:00 2001 From: NGPixel Date: Sat, 26 Oct 2019 16:36:47 -0400 Subject: [PATCH] fix: setup truncate + autoprefixer rollback --- package.json | 2 +- server/setup.js | 47 +++++++++++++++++++++++++++++------------------ yarn.lock | 20 ++++++++++---------- 3 files changed, 40 insertions(+), 29 deletions(-) diff --git a/package.json b/package.json index 22f883ff..703640ef 100644 --- a/package.json +++ b/package.json @@ -193,7 +193,7 @@ "apollo-link-persisted-queries": "0.2.2", "apollo-link-ws": "1.0.19", "apollo-utilities": "1.3.2", - "autoprefixer": "9.7.0", + "autoprefixer": "9.6.4", "babel-eslint": "10.0.3", "babel-jest": "24.9.0", "babel-loader": "^8.0.6", diff --git a/server/setup.js b/server/setup.js index e24ea915..ece6288c 100644 --- a/server/setup.js +++ b/server/setup.js @@ -189,24 +189,35 @@ module.exports = () => { ]) // Truncate tables (reset from previous failed install) - if (WIKI.config.db.type !== 'mssql') { - await WIKI.models.locales.query().truncate() - await WIKI.models.groups.query().truncate() - await WIKI.models.users.query().truncate() - await WIKI.models.navigation.query().truncate() - } else { - await WIKI.models.locales.query().del() - await WIKI.models.groups.query().del() - await WIKI.models.users.query().del() - await WIKI.models.navigation.query().truncate() - await WIKI.models.knex.raw(` - IF EXISTS (SELECT * FROM sys.identity_columns WHERE OBJECT_NAME(OBJECT_ID) = 'groups' AND last_value IS NOT NULL) - DBCC CHECKIDENT ([groups], RESEED, 0) - `) - await WIKI.models.knex.raw(` - IF EXISTS (SELECT * FROM sys.identity_columns WHERE OBJECT_NAME(OBJECT_ID) = 'users' AND last_value IS NOT NULL) - DBCC CHECKIDENT ([users], RESEED, 0) - `) + await WIKI.models.locales.query().where('code', '!=', 'x').del() + await WIKI.models.navigation.query().truncate() + switch (WIKI.config.db.type) { + case 'postgres': + await WIKI.models.knex.raw('TRUNCATE groups, users CASCADE') + break + case 'mysql': + case 'mariadb': + await WIKI.models.groups.query().where('id', '>', 0).del() + await WIKI.models.users.query().where('id', '>', 0).del() + await WIKI.models.knex.raw('ALTER TABLE groups AUTO_INCREMENT = 1') + await WIKI.models.knex.raw('ALTER TABLE users AUTO_INCREMENT = 1') + break + case 'mssql': + await WIKI.models.groups.query().del() + await WIKI.models.users.query().del() + await WIKI.models.knex.raw(` + IF EXISTS (SELECT * FROM sys.identity_columns WHERE OBJECT_NAME(OBJECT_ID) = 'groups' AND last_value IS NOT NULL) + DBCC CHECKIDENT ([groups], RESEED, 0) + `) + await WIKI.models.knex.raw(` + IF EXISTS (SELECT * FROM sys.identity_columns WHERE OBJECT_NAME(OBJECT_ID) = 'users' AND last_value IS NOT NULL) + DBCC CHECKIDENT ([users], RESEED, 0) + `) + break + case 'sqlite': + await WIKI.models.groups.query().truncate() + await WIKI.models.users.query().truncate() + break } // Create default locale diff --git a/yarn.lock b/yarn.lock index 80c91604..7ffbbe37 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2616,17 +2616,17 @@ auto-load@3.0.4: resolved "https://registry.yarnpkg.com/auto-load/-/auto-load-3.0.4.tgz#57efe1bd7ed2144992e6fcfb3bc100db13de4a0e" integrity sha512-ufENezHsnouUiIgwCMuqzcdiABBucBb8CV/5uchw9XuMhf8KXIqF3PgxRzhIuW3C470gjb5niq6zaaF9nhjPIQ== -autoprefixer@9.7.0: - version "9.7.0" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.0.tgz#905ec19e50f04545fe9ff131182cc9ab25246901" - integrity sha512-j2IRvaCfrUxIiZun9ba4mhJ2omhw4OY88/yVzLO+lHhGBumAAK72PgM6gkbSN8iregPOn1ZlxGkmZh2CQ7X4AQ== +autoprefixer@9.6.4: + version "9.6.4" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.6.4.tgz#e6453be47af316b2923eaeaed87860f52ad4b7eb" + integrity sha512-Koz2cJU9dKOxG8P1f8uVaBntOv9lP4yz9ffWvWaicv9gHBPhpQB22nGijwd8gqW9CNT+UdkbQOQNLVI8jN1ZfQ== dependencies: - browserslist "^4.7.2" - caniuse-lite "^1.0.30001004" + browserslist "^4.7.0" + caniuse-lite "^1.0.30000998" chalk "^2.4.2" normalize-range "^0.1.2" num2fraction "^1.2.2" - postcss "^7.0.19" + postcss "^7.0.18" postcss-value-parser "^4.0.2" autoprefixer@^7.1.1: @@ -3127,7 +3127,7 @@ browserslist@^4.0.0, browserslist@^4.6.0, browserslist@^4.6.3, browserslist@^4.6 electron-to-chromium "^1.3.247" node-releases "^1.1.29" -browserslist@^4.7.2: +browserslist@^4.7.0, browserslist@^4.7.2: version "4.7.2" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.7.2.tgz#1bb984531a476b5d389cedecb195b2cd69fb1348" integrity sha512-uZavT/gZXJd2UTi9Ov7/Z340WOSQ3+m1iBVRUknf+okKxonL9P83S3ctiBDtuRmRu8PiCHjqyueqQ9HYlJhxiw== @@ -3388,7 +3388,7 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000792, caniuse-lite@^1.0.30000805, can resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000989.tgz#b9193e293ccf7e4426c5245134b8f2a56c0ac4b9" integrity sha512-vrMcvSuMz16YY6GSVZ0dWDTJP8jqk3iFQ/Aq5iqblPwxSVVZI+zxDyTX0VPqtQsDnfdrBDcsmhgTEOh5R8Lbpw== -caniuse-lite@^1.0.30001004: +caniuse-lite@^1.0.30000998, caniuse-lite@^1.0.30001004: version "1.0.30001004" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001004.tgz#d879b73981b255488316da946c39327d8c00a586" integrity sha512-3nfOR4O8Wa2RWoYfJkMtwRVOsK96TQ+eq57wd0iKaEWl8dwG4hKZ/g0MVBfCvysFvMLi9fQGR/DvozMdkEPl3g== @@ -10907,7 +10907,7 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.1 source-map "^0.6.1" supports-color "^6.1.0" -postcss@^7.0.19: +postcss@^7.0.18: version "7.0.21" resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.21.tgz#06bb07824c19c2021c5d056d5b10c35b989f7e17" integrity sha512-uIFtJElxJo29QC753JzhidoAhvp/e/Exezkdhfmt8AymWT6/5B7W1WmponYWkHk2eg6sONyTch0A3nkMPun3SQ==