From d67ea662641de6b7e725f9280a39a2429f025173 Mon Sep 17 00:00:00 2001 From: Garry Lachman Date: Tue, 14 Feb 2023 14:47:21 +0200 Subject: [PATCH] remove better-sql3 --- config/webpack.main.config.ts | 1 + package.json | 5 +- .../shared/lib/defenitions/server.define.d.ts | 2 +- .../lib/defenitions/server.define.d.ts.map | 2 +- packages/shared/lib/enums/server.enum.d.ts | 1 - .../shared/lib/enums/server.enum.d.ts.map | 2 +- packages/shared/lib/enums/server.enum.js | 1 - packages/shared/lib/enums/server.enum.js.map | 2 +- .../shared/src/defenitions/server.define.ts | 1 - packages/shared/src/enums/server.enum.ts | 1 - src/main/data/queries/heart-beat.queries.ts | 1 - src/main/services/database.service.ts | 1 - .../components/icons/database-icon.tsx | 3 - .../record-object/account.define.ts | 8 +- .../add-account-modal/add-account-wizard.tsx | 4 +- .../steps/accounts-wizard-details.tsx | 1 - yarn.lock | 113 ++---------------- 17 files changed, 20 insertions(+), 129 deletions(-) diff --git a/config/webpack.main.config.ts b/config/webpack.main.config.ts index ba30b856..1e2e2d3e 100644 --- a/config/webpack.main.config.ts +++ b/config/webpack.main.config.ts @@ -21,6 +21,7 @@ export const mainConfig: Configuration = { nock: 'nock', oracledb: 'oracledb', 'pg-native': 'pg-native', + 'better-sqlite3': 'better-sqlite3', }, // Put your normal webpack config below here module: { diff --git a/package.json b/package.json index 1b11c72f..718f85db 100644 --- a/package.json +++ b/package.json @@ -80,11 +80,11 @@ "@chakra-ui/transition": "^2.0.15", "@chakra-ui/utils": "^2.0.15", "@day1co/fastcase": "github:garrylachman/fastcase#main", - "@electrocrud/shared": "link:./packages/shared", - "@electrocrud/utils": "link:./packages/utils", "@electrocrud/buttons": "link:./packages/buttons", "@electrocrud/feedback": "link:./packages/feedback", + "@electrocrud/shared": "link:./packages/shared", "@electrocrud/tables": "link:./packages/tables", + "@electrocrud/utils": "link:./packages/utils", "@emotion/cache": "^11.7.1", "@emotion/react": "^11", "@emotion/styled": "^11", @@ -113,7 +113,6 @@ "@uiw/react-markdown-editor": "^5.10.1", "add": "^2.0.6", "arc-hash": "^3.0.0", - "better-sqlite3": "^8.1.0", "chroma-js": "^2.4.2", "crypto-browserify": "^3.12.0", "crypto-js": "^4.1.1", diff --git a/packages/shared/lib/defenitions/server.define.d.ts b/packages/shared/lib/defenitions/server.define.d.ts index 0a6db1da..7fe240fb 100644 --- a/packages/shared/lib/defenitions/server.define.d.ts +++ b/packages/shared/lib/defenitions/server.define.d.ts @@ -1,6 +1,6 @@ import { O } from 'ts-toolbelt'; import { QueryAggregateEnum, ServerTypeEnum } from '../enums'; -export type ServerType = ServerTypeEnum.MYSQL2 | ServerTypeEnum.MYSQL | ServerTypeEnum.MSSQL | ServerTypeEnum.ORACEL | ServerTypeEnum.POSTGRES | ServerTypeEnum.BETTER_SQLITE | ServerTypeEnum.SQLITE; +export type ServerType = ServerTypeEnum.MYSQL2 | ServerTypeEnum.MYSQL | ServerTypeEnum.MSSQL | ServerTypeEnum.ORACEL | ServerTypeEnum.POSTGRES | ServerTypeEnum.SQLITE; export type TablesListRow = Record & { table_name: string; }; diff --git a/packages/shared/lib/defenitions/server.define.d.ts.map b/packages/shared/lib/defenitions/server.define.d.ts.map index 2d990ce6..15c86de3 100644 --- a/packages/shared/lib/defenitions/server.define.d.ts.map +++ b/packages/shared/lib/defenitions/server.define.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"server.define.d.ts","sourceRoot":"","sources":["../../src/defenitions/server.define.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"server.define.d.ts","sourceRoot":"","sources":["../../src/defenitions/server.define.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,aAAa,CAAC;AAChC,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAE9D,MAAM,MAAM,UAAU,GAClB,cAAc,CAAC,MAAM,GACrB,cAAc,CAAC,KAAK,GACpB,cAAc,CAAC,KAAK,GACpB,cAAc,CAAC,MAAM,GACrB,cAAc,CAAC,QAAQ,GACvB,cAAc,CAAC,MAAM,CAAC;AAE1B,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG;IAChD,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,OAAO,CAAC;IACrB,SAAS,EAAE,OAAO,CAAC;IACnB,cAAc,EAAE,OAAO,CAAC;IACxB,YAAY,EAAE,OAAO,CAAC;IACtB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;IACxB,KAAK,EAAE,KAAK,GAAG,MAAM,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,EAAE;QACF,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,GAAG,EAAE,MAAM,CAAC;KACb,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;IACvB,EAAE,EAAE,OAAO,CAAC;CACb,CAAC;AAEF,MAAM,MAAM,cAAc,CAAC,CAAC,IAAI;IAC9B,IAAI,EAAE,CAAC,EAAE,CAAC;IACV,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,oBAAoB,CAAC,CAAC,IAAI;IACpC,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,cAAc,GACtB,kBAAkB,CAAC,GAAG,GACtB,kBAAkB,CAAC,YAAY,GAC/B,kBAAkB,CAAC,KAAK,GACxB,kBAAkB,CAAC,cAAc,GACjC,kBAAkB,CAAC,GAAG,GACtB,kBAAkB,CAAC,GAAG,GACtB,kBAAkB,CAAC,GAAG,GACtB,kBAAkB,CAAC,GAAG,GACtB,kBAAkB,CAAC,YAAY,CAAC;AAEpC,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG,CAAC,CAAC,MAAM,CAC3C;IACE,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,EACD,MAAM,GAAG,QAAQ,CAClB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,sBAAsB,GAAG,oBAAoB,CAAC;AAE7E,MAAM,MAAM,iBAAiB,GAAG;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,UAAU,EAAE,CAAC;IACrB,IAAI,CAAC,EAAE,SAAS,EAAE,CAAC;IACnB,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,MAAM,CAAC,EAAE,GAAG,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,KAAK,CAAC,EAAE,UAAU,EAAE,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,UAAU,EAAE,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC;CACnD,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,cAAc,CAAC;IACrB,KAAK,CAAC,EAAE,UAAU,EAAE,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,EAAE,cAAc,CAAC;IACvB,UAAU,EAAE,gBAAgB,CAAC;IAC7B,MAAM,CAAC,EAAE,eAAe,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,aAAa,GACrB,gBAAgB,GAChB,uBAAuB,GACvB,mBAAmB,GACnB,mBAAmB,GACnB,mBAAmB,GACnB,iBAAiB,GACjB,eAAe,CAAC"} \ No newline at end of file diff --git a/packages/shared/lib/enums/server.enum.d.ts b/packages/shared/lib/enums/server.enum.d.ts index 390c816c..bb61468f 100644 --- a/packages/shared/lib/enums/server.enum.d.ts +++ b/packages/shared/lib/enums/server.enum.d.ts @@ -3,7 +3,6 @@ export declare enum ServerTypeEnum { MYSQL2 = "mysql2", POSTGRES = "pg", SQLITE = "sqlite3", - BETTER_SQLITE = "better-sqlite3", MSSQL = "mssql", ORACEL = "oracledb" } diff --git a/packages/shared/lib/enums/server.enum.d.ts.map b/packages/shared/lib/enums/server.enum.d.ts.map index a84efe3d..7a8e6d93 100644 --- a/packages/shared/lib/enums/server.enum.d.ts.map +++ b/packages/shared/lib/enums/server.enum.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"server.enum.d.ts","sourceRoot":"","sources":["../../src/enums/server.enum.ts"],"names":[],"mappings":"AAAA,oBAAY,cAAc;IACxB,KAAK,UAAU;IACf,MAAM,WAAW;IACjB,QAAQ,OAAO;IACf,MAAM,YAAY;IAClB,aAAa,mBAAmB;IAChC,KAAK,UAAU;IACf,MAAM,aAAa;CACpB;AAED,oBAAY,kBAAkB;IAC5B,YAAY,gBAAgB;IAC5B,GAAG,QAAQ;IACX,GAAG,QAAQ;IACX,YAAY,gBAAgB;IAC5B,GAAG,QAAQ;IACX,GAAG,QAAQ;IACX,cAAc,kBAAkB;IAChC,KAAK,UAAU;CAChB;AAED,oBAAY,iBAAiB;IAC3B,EAAE,MAAM;IACR,MAAM,OAAO;IACb,EAAE,MAAM;IACR,GAAG,OAAO;IACV,EAAE,MAAM;IACR,GAAG,OAAO;IACV,EAAE,OAAO;IACT,MAAM,WAAW;IACjB,IAAI,SAAS;CACd"} \ No newline at end of file +{"version":3,"file":"server.enum.d.ts","sourceRoot":"","sources":["../../src/enums/server.enum.ts"],"names":[],"mappings":"AAAA,oBAAY,cAAc;IACxB,KAAK,UAAU;IACf,MAAM,WAAW;IACjB,QAAQ,OAAO;IACf,MAAM,YAAY;IAClB,KAAK,UAAU;IACf,MAAM,aAAa;CACpB;AAED,oBAAY,kBAAkB;IAC5B,YAAY,gBAAgB;IAC5B,GAAG,QAAQ;IACX,GAAG,QAAQ;IACX,YAAY,gBAAgB;IAC5B,GAAG,QAAQ;IACX,GAAG,QAAQ;IACX,cAAc,kBAAkB;IAChC,KAAK,UAAU;CAChB;AAED,oBAAY,iBAAiB;IAC3B,EAAE,MAAM;IACR,MAAM,OAAO;IACb,EAAE,MAAM;IACR,GAAG,OAAO;IACV,EAAE,MAAM;IACR,GAAG,OAAO;IACV,EAAE,OAAO;IACT,MAAM,WAAW;IACjB,IAAI,SAAS;CACd"} \ No newline at end of file diff --git a/packages/shared/lib/enums/server.enum.js b/packages/shared/lib/enums/server.enum.js index 42ace4a6..8c8aaf4a 100644 --- a/packages/shared/lib/enums/server.enum.js +++ b/packages/shared/lib/enums/server.enum.js @@ -7,7 +7,6 @@ var ServerTypeEnum; ServerTypeEnum["MYSQL2"] = "mysql2"; ServerTypeEnum["POSTGRES"] = "pg"; ServerTypeEnum["SQLITE"] = "sqlite3"; - ServerTypeEnum["BETTER_SQLITE"] = "better-sqlite3"; ServerTypeEnum["MSSQL"] = "mssql"; ServerTypeEnum["ORACEL"] = "oracledb"; })(ServerTypeEnum = exports.ServerTypeEnum || (exports.ServerTypeEnum = {})); diff --git a/packages/shared/lib/enums/server.enum.js.map b/packages/shared/lib/enums/server.enum.js.map index 7994b545..34e7a035 100644 --- a/packages/shared/lib/enums/server.enum.js.map +++ b/packages/shared/lib/enums/server.enum.js.map @@ -1 +1 @@ -{"version":3,"file":"server.enum.js","sourceRoot":"","sources":["../../src/enums/server.enum.ts"],"names":[],"mappings":";;;AAAA,IAAY,cAQX;AARD,WAAY,cAAc;IACxB,iCAAe,CAAA;IACf,mCAAiB,CAAA;IACjB,iCAAe,CAAA;IACf,oCAAkB,CAAA;IAClB,kDAAgC,CAAA;IAChC,iCAAe,CAAA;IACf,qCAAmB,CAAA;AACrB,CAAC,EARW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAQzB;AAED,IAAY,kBASX;AATD,WAAY,kBAAkB;IAC5B,kDAA4B,CAAA;IAC5B,iCAAW,CAAA;IACX,iCAAW,CAAA;IACX,kDAA4B,CAAA;IAC5B,iCAAW,CAAA;IACX,iCAAW,CAAA;IACX,sDAAgC,CAAA;IAChC,qCAAe,CAAA;AACjB,CAAC,EATW,kBAAkB,GAAlB,0BAAkB,KAAlB,0BAAkB,QAS7B;AAED,IAAY,iBAUX;AAVD,WAAY,iBAAiB;IAC3B,6BAAQ,CAAA;IACR,kCAAa,CAAA;IACb,6BAAQ,CAAA;IACR,+BAAU,CAAA;IACV,6BAAQ,CAAA;IACR,+BAAU,CAAA;IACV,8BAAS,CAAA;IACT,sCAAiB,CAAA;IACjB,kCAAa,CAAA;AACf,CAAC,EAVW,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QAU5B"} \ No newline at end of file +{"version":3,"file":"server.enum.js","sourceRoot":"","sources":["../../src/enums/server.enum.ts"],"names":[],"mappings":";;;AAAA,IAAY,cAOX;AAPD,WAAY,cAAc;IACxB,iCAAe,CAAA;IACf,mCAAiB,CAAA;IACjB,iCAAe,CAAA;IACf,oCAAkB,CAAA;IAClB,iCAAe,CAAA;IACf,qCAAmB,CAAA;AACrB,CAAC,EAPW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAOzB;AAED,IAAY,kBASX;AATD,WAAY,kBAAkB;IAC5B,kDAA4B,CAAA;IAC5B,iCAAW,CAAA;IACX,iCAAW,CAAA;IACX,kDAA4B,CAAA;IAC5B,iCAAW,CAAA;IACX,iCAAW,CAAA;IACX,sDAAgC,CAAA;IAChC,qCAAe,CAAA;AACjB,CAAC,EATW,kBAAkB,GAAlB,0BAAkB,KAAlB,0BAAkB,QAS7B;AAED,IAAY,iBAUX;AAVD,WAAY,iBAAiB;IAC3B,6BAAQ,CAAA;IACR,kCAAa,CAAA;IACb,6BAAQ,CAAA;IACR,+BAAU,CAAA;IACV,6BAAQ,CAAA;IACR,+BAAU,CAAA;IACV,8BAAS,CAAA;IACT,sCAAiB,CAAA;IACjB,kCAAa,CAAA;AACf,CAAC,EAVW,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QAU5B"} \ No newline at end of file diff --git a/packages/shared/src/defenitions/server.define.ts b/packages/shared/src/defenitions/server.define.ts index edf36b0a..376705f5 100644 --- a/packages/shared/src/defenitions/server.define.ts +++ b/packages/shared/src/defenitions/server.define.ts @@ -7,7 +7,6 @@ export type ServerType = | ServerTypeEnum.MSSQL | ServerTypeEnum.ORACEL | ServerTypeEnum.POSTGRES - | ServerTypeEnum.BETTER_SQLITE | ServerTypeEnum.SQLITE; export type TablesListRow = Record & { diff --git a/packages/shared/src/enums/server.enum.ts b/packages/shared/src/enums/server.enum.ts index 032b8ee9..13345753 100644 --- a/packages/shared/src/enums/server.enum.ts +++ b/packages/shared/src/enums/server.enum.ts @@ -3,7 +3,6 @@ export enum ServerTypeEnum { MYSQL2 = 'mysql2', POSTGRES = 'pg', SQLITE = 'sqlite3', - BETTER_SQLITE = 'better-sqlite3', MSSQL = 'mssql', ORACEL = 'oracledb', } diff --git a/src/main/data/queries/heart-beat.queries.ts b/src/main/data/queries/heart-beat.queries.ts index f403d5f7..f2fa6f0f 100644 --- a/src/main/data/queries/heart-beat.queries.ts +++ b/src/main/data/queries/heart-beat.queries.ts @@ -7,5 +7,4 @@ export const heartBeatQueries: Record = { [ServerTypeEnum.POSTGRES]: 'SELECT 1', [ServerTypeEnum.MSSQL]: 'SELECT 1', [ServerTypeEnum.SQLITE]: 'SELECT 1', - [ServerTypeEnum.BETTER_SQLITE]: 'SELECT 1', }; diff --git a/src/main/services/database.service.ts b/src/main/services/database.service.ts index 4dedd057..c924cc03 100644 --- a/src/main/services/database.service.ts +++ b/src/main/services/database.service.ts @@ -1,4 +1,3 @@ -import 'better-sqlite3'; import 'reflect-metadata'; import 'sqlite3'; import sqlFormatter from '@sqltools/formatter'; diff --git a/src/renderer/components/icons/database-icon.tsx b/src/renderer/components/icons/database-icon.tsx index 2b645e46..d4e12a8d 100644 --- a/src/renderer/components/icons/database-icon.tsx +++ b/src/renderer/components/icons/database-icon.tsx @@ -24,9 +24,6 @@ export const DatabaseIcon: FC = ({ case ServerTypeEnum.SQLITE: { return ; } - case ServerTypeEnum.BETTER_SQLITE: { - return ; - } case ServerTypeEnum.POSTGRES: { return ; } diff --git a/src/renderer/defenitions/record-object/account.define.ts b/src/renderer/defenitions/record-object/account.define.ts index 4717a7e9..8ca92a55 100644 --- a/src/renderer/defenitions/record-object/account.define.ts +++ b/src/renderer/defenitions/record-object/account.define.ts @@ -53,12 +53,11 @@ export const ValidateConnection = Joi.object({ ServerTypeEnum.MYSQL, ServerTypeEnum.ORACEL, ServerTypeEnum.POSTGRES, - ServerTypeEnum.SQLITE, - ServerTypeEnum.BETTER_SQLITE, + ServerTypeEnum.SQLITE ) .required(), connection: Joi.when(Joi.ref('..client'), { - is: ServerTypeEnum.SQLITE || ServerTypeEnum.BETTER_SQLITE, + is: ServerTypeEnum.SQLITE, // eslint-disable-next-line unicorn/no-thenable then: ValidateSqliteConnection.required(), otherwise: ValidateServerConnection.required(), @@ -76,8 +75,7 @@ export const ValidateAccountsWizardStep1 = Joi.object({ ServerTypeEnum.MYSQL, ServerTypeEnum.ORACEL, ServerTypeEnum.POSTGRES, - ServerTypeEnum.SQLITE, - ServerTypeEnum.BETTER_SQLITE, + ServerTypeEnum.SQLITE ) .required(), connection: Joi.optional(), diff --git a/src/renderer/views/admin/accounts/add-account-modal/add-account-wizard.tsx b/src/renderer/views/admin/accounts/add-account-modal/add-account-wizard.tsx index a8470115..9f905b4c 100644 --- a/src/renderer/views/admin/accounts/add-account-modal/add-account-wizard.tsx +++ b/src/renderer/views/admin/accounts/add-account-modal/add-account-wizard.tsx @@ -120,7 +120,7 @@ export const AddAccountWizard: FC = ({ const AccountsWizardConnection = useCallback( () => - state.client === ServerTypeEnum.SQLITE || ServerTypeEnum.BETTER_SQLITE ? ( + state.client === ServerTypeEnum.SQLITE ? ( = ({ { name: 'tunnel', title: 'SSH Tunnel', - enabled: state.client !== ServerTypeEnum.SQLITE && state.client !== ServerTypeEnum.BETTER_SQLITE, + enabled: state.client !== ServerTypeEnum.SQLITE, children: (