github
/
nocodb
mirror of https://github.com/nocodb/nocodb
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

feat: migrate to better-sqlite3 

Signed-off-by: mertmit <mertmit99@gmail.com>
feat/better-sqlite3
mertmit 2 years ago
parent
97e7cda67f
commit
83a7ad1c05
40 changed files with 4942 additions and 10148 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      packages/nc-gui/lib/enums.ts
  2. 2
      packages/nocodb-sdk/src/lib/sqlUi/SqlUiFactory.ts
  3. 14651
      packages/nocodb/package-lock.json
  4. 3
      packages/nocodb/package.json
  5. 5
      packages/nocodb/src/lib/db/sql-client/lib/KnexClient.ts
  6. 4
      packages/nocodb/src/lib/db/sql-client/lib/SqlClientFactory.ts
  7. 3
      packages/nocodb/src/lib/db/sql-client/lib/sqlite/SqliteClient.ts
  8. 2
      packages/nocodb/src/lib/db/sql-data-mapper/__tests__/conditionClause.test.js
  9. 2
      packages/nocodb/src/lib/db/sql-data-mapper/lib/BaseModel.ts
  10. 3
      packages/nocodb/src/lib/db/sql-data-mapper/lib/DbFactory.ts
  11. 2
      packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/BaseModelSql.ts
  12. 2
      packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/BaseModelSqlv2.ts
  13. 4
      packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/CustomKnex.ts
  14. 2
      packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/formulaQueryBuilderFromString.ts
  15. 4
      packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/formulav2/formulaQueryBuilderv2.ts
  16. 1
      packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/mapFunctionName.ts
  17. 10
      packages/nocodb/src/lib/db/sql-mgr/SqlMgr.ts
  18. 2
      packages/nocodb/src/lib/db/sql-mgr/code/gql-schema/xc-ts/GqlXcSchemaFactory.ts
  19. 2
      packages/nocodb/src/lib/db/sql-mgr/code/models/xc/ModelXcMetaFactory.ts
  20. 1
      packages/nocodb/src/lib/db/sql-mgr/code/routers/xc-ts/SwaggerTypes.ts
  21. 4
      packages/nocodb/src/lib/db/sql-migrator/lib/KnexMigrator.ts
  22. 4
      packages/nocodb/src/lib/db/sql-migrator/lib/KnexMigratorv2.ts
  23. 1
      packages/nocodb/src/lib/db/sql-migrator/lib/SqlMigratorFactory.ts
  24. 8
      packages/nocodb/src/lib/db/sql-migrator/lib/templates/sqlite.template.ts
  25. 2
      packages/nocodb/src/lib/meta/MetaAPILogger.ts
  26. 2
      packages/nocodb/src/lib/meta/NcMetaIOImpl.ts
  27. 10
      packages/nocodb/src/lib/meta/api/columnApis.ts
  28. 6
      packages/nocodb/src/lib/meta/api/projectApis.ts
  29. 198
      packages/nocodb/src/lib/meta/api/sync/helpers/EntityMap.ts
  30. 87
      packages/nocodb/src/lib/meta/api/sync/helpers/job.ts
  31. 7
      packages/nocodb/src/lib/meta/api/sync/helpers/readAndProcessData.ts
  32. 4
      packages/nocodb/src/lib/migrations/v2/nc_012_alter_column_data_types.ts
  33. 4
      packages/nocodb/src/lib/migrations/v2/nc_014_alter_column_data_types.ts
  34. 4
      packages/nocodb/src/lib/migrations/v2/nc_016_alter_hooklog_payload_types.ts
  35. 4
      packages/nocodb/src/lib/models/Base.ts
  36. 26
      packages/nocodb/src/lib/utils/NcConfigFactory.ts
  37. 2
      packages/nocodb/src/lib/utils/common/NcConnectionMgr.ts
  38. 4
      packages/nocodb/src/lib/v1-legacy/templates/NcTemplateParser.ts
  39. 4
      packages/nocodb/tests/unit/TestDbMngr.ts
  40. 2
      packages/nocodb/tests/unit/init/db.ts

2
packages/nc-gui/lib/enums.ts
Unescape View File

@ -17,7 +17,7 @@ export enum ClientType {
MYSQL = 'mysql2',
MSSQL = 'mssql',
PG = 'pg',
SQLITE = 'sqlite3',
SQLITE = 'better-sqlite3',
VITESS = 'vitess',
}

2
packages/nocodb-sdk/src/lib/sqlUi/SqlUiFactory.ts
Unescape View File

@ -26,7 +26,7 @@ export class SqlUiFactory {
return MysqlUi;
}
if (connectionConfig.client === 'sqlite3') {
if (connectionConfig.client === 'sqlite3' || connectionConfig.client === 'better-sqlite3') {
return SqliteUi;
}
if (connectionConfig.client === 'mssql') {

14651
packages/nocodb/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

3
packages/nocodb/package.json
Unescape View File

@ -62,6 +62,7 @@
"aws-sdk": "^2.829.0",
"axios": "^0.21.1",
"bcryptjs": "^2.4.3",
"better-sqlite3": "^7.6.2",
"body-parser": "^1.19.0",
"boxen": "^5.0.0",
"bullmq": "^1.81.1",
@ -130,7 +131,6 @@
"rmdir": "^1.2.0",
"slash": "^3.0.0",
"socket.io": "^4.4.1",
"sqlite3": "5.1.2",
"tedious": "^15.0.0",
"tinycolor2": "^1.4.2",
"twilio": "^3.55.1",
@ -141,6 +141,7 @@
"xlsx": "^0.18.5"
},
"devDependencies": {
"@types/better-sqlite3": "^7.6.2",
"@types/chai": "^4.2.12",
"@types/express": "^4.17.7",
"@types/inflection": "^1.5.28",

5
packages/nocodb/src/lib/db/sql-client/lib/KnexClient.ts
Unescape View File

@ -608,9 +608,12 @@ class KnexClient extends SqlClient {
}
}
const tmpConnectionConfig =
connectionConfig.client === 'sqlite3'
connectionConfig.client === 'sqlite3' || connectionConfig.client === 'better-sqlite3'
? connectionConfig.connection
: connectionConfig;
tmpConnectionConfig.client = tmpConnectionConfig.client === 'sqlite3' ? 'better-sqlite3' : tmpConnectionConfig.client;
this.sqlClient = knex(tmpConnectionConfig);
}
this.knex = this.sqlClient;

4
packages/nocodb/src/lib/db/sql-client/lib/SqlClientFactory.ts
Unescape View File

@ -21,7 +21,9 @@ class SqlClientFactory {
if (connectionConfig.meta.dbtype === 'vitess')
return new VitessClient(connectionConfig);
return new MySqlClient(connectionConfig);
} else if (connectionConfig.client === 'sqlite3') {
} else if (connectionConfig.client === 'sqlite3' || connectionConfig.client === 'better-sqlite3') {
connectionConfig.client = 'better-sqlite3';
connectionConfig.connection.client = 'better-sqlite3';
return new SqliteClient(connectionConfig);
} else if (connectionConfig.client === 'mssql') {
return new MssqlClient(connectionConfig);

3
packages/nocodb/src/lib/db/sql-client/lib/sqlite/SqliteClient.ts
Unescape View File

@ -16,6 +16,7 @@ class SqliteClient extends KnexClient {
constructor(connectionConfig) {
super(connectionConfig);
connectionConfig.connection.client = connectionConfig.connection.client === 'sqlite3' ? 'better-sqlite3' : connectionConfig.connection.client;
this.sqlClient = knex(connectionConfig.connection);
this.queries = queries;
this._version = {};
@ -127,6 +128,8 @@ class SqliteClient extends KnexClient {
try {
const exists = await promisify(fs.exists)(args.database);
this.connectionConfig.connection.client = this.connectionConfig.connection.client === 'sqlite3' ? 'better-sqlite3' : this.connectionConfig.connection.client;
if (!exists) {
log.debug('sqlite file do no exists - create one');
const fd = await promisify(fs.open)(args.database, 'w');

2
packages/nocodb/src/lib/db/sql-data-mapper/__tests__/conditionClause.test.js
Unescape View File

@ -100,7 +100,7 @@ it(`Test`, function (done) {
},
{
knex :cstomKnex({
client: 'sqlite3'
client: 'better-sqlite3'
}),
expectedOp: 'select * from `test` inner join `test1` on `test1`.`test_ref_id` = `test`.`test_id` inner join `test3` on `test1`.`test3_ref_id` = `test3`.`test3_id` where `test3`.`test3Col` = \'123\''
},

2
packages/nocodb/src/lib/db/sql-data-mapper/lib/BaseModel.ts
Unescape View File

@ -1193,7 +1193,7 @@ abstract class BaseModel {
}
isSqlite(): boolean {
return this.clientType === 'sqlite3';
return this.clientType === 'sqlite3' || this.clientType === 'better-sqlite3';
}
/**

3
packages/nocodb/src/lib/db/sql-data-mapper/lib/DbFactory.ts
Unescape View File

@ -2,7 +2,8 @@ import knex from './sql/CustomKnex';
export class DbFactory {
static create(connectionConfig) {
if (connectionConfig.client === 'sqlite3') {
if (connectionConfig.client === 'sqlite3' || connectionConfig.client === 'better-sqlite3') {
connectionConfig.connection.client = connectionConfig.connection.client === 'sqlite3' ? 'better-sqlite3' : connectionConfig.connection.client;
return knex(connectionConfig.connection);
} else if (
['mysql', 'mysql2', 'pg', 'mssql'].includes(connectionConfig.client)

2
packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/BaseModelSql.ts
Unescape View File

@ -2095,7 +2095,7 @@ class BaseModelSql extends BaseModel {
}
isSqlite() {
return this.clientType === 'sqlite3';
return this.clientType === 'sqlite3' || this.clientType === 'better-sqlite3';
}
isMssql() {

2
packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/BaseModelSqlv2.ts
Unescape View File

@ -1639,7 +1639,7 @@ class BaseModelSqlv2 {
}
get isSqlite() {
return this.clientType === 'sqlite3';
return this.clientType === 'sqlite3' || this.clientType === 'better-sqlite3';
}
get isMssql() {

4
packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/CustomKnex.ts
Unescape View File

@ -557,6 +557,7 @@ knex.QueryBuilder.extend('concat', function (cn: any) {
this.select(this.client.raw(`STRING_AGG(??, ',')`, [cn]));
break;
case 'sqlite3':
case 'better-sqlite3':
this.select(this.client.raw(`GROUP_CONCAT(?? , ',')`, [cn]));
break;
}
@ -988,6 +989,9 @@ function parseNestedCondition(obj, qb, pKey?, table?, tableAlias?) {
type CustomKnex = Knex;
function CustomKnex(arg: string | Knex.Config<any> | any): CustomKnex {
if (arg?.client === 'sqlite3') {
arg.client = 'better-sqlite3';
}
const kn: any = knex(arg);
const knexRaw = kn.raw;

2
packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/formulaQueryBuilderFromString.ts
Unescape View File

@ -47,7 +47,7 @@ export default function formulaQueryBuilder(
// }
// break;
case 'CONCAT':
if (knex.clientType() === 'sqlite3') {
if (knex.clientType() === 'better-sqlite3') {
if (pt.arguments.length > 1) {
return fn(
{

4
packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/formulav2/formulaQueryBuilderv2.ts
Unescape View File

@ -549,7 +549,7 @@ export default async function formulaQueryBuilderv2(
// }
// break;
case 'CONCAT':
if (knex.clientType() === 'sqlite3') {
if (knex.clientType() === 'better-sqlite3') {
if (pt.arguments.length > 1) {
return fn(
{
@ -655,7 +655,7 @@ export default async function formulaQueryBuilderv2(
let sql = `${left} ${pt.operator} ${right}${colAlias}`;
// handle NULL values when calling CONCAT for sqlite3
if (pt.left.fnName === 'CONCAT' && knex.clientType() === 'sqlite3') {
if (pt.left.fnName === 'CONCAT' && knex.clientType() === 'better-sqlite3') {
sql = `COALESCE(${left}, '') ${pt.operator} COALESCE(${right},'')${colAlias}`;
}

1
packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/mapFunctionName.ts
Unescape View File

@ -35,6 +35,7 @@ const mapFunctionName = (args: MapFnArgs): any => {
break;
case 'sqlite':
case 'sqlite3':
case 'better-sqlite3':
val = sqlite[name] || name;
break;
}

10
packages/nocodb/src/lib/db/sql-mgr/SqlMgr.ts
Unescape View File

@ -386,7 +386,7 @@ export default class SqlMgr {
}
}
if (connectionConfig.client === 'sqlite3') {
if (connectionConfig.client === 'sqlite3' || connectionConfig.client === 'better-sqlite3') {
schemaKey = connectionConfig.connection.connection.filename;
} else {
schemaKey =
@ -503,7 +503,8 @@ export default class SqlMgr {
return 'mssql';
break;
case 'sqlite3:':
return 'sqlite3';
case 'better-sqlite3:':
return 'better-sqlite3';
break;
case 'cockroachdb:':
return 'pg';
@ -518,9 +519,9 @@ export default class SqlMgr {
const ORACLE_PORT = 1521;
if (sqlConfig.typeOfDatabase === 'sqlite3') {
if (sqlConfig.typeOfDatabase === 'sqlite3' || sqlConfig.typeOfDatabase === 'better-sqlite3') {
return {
client: 'sqlite3',
client: 'better-sqlite3',
connection: {
// filename: "./db/sakila-sqlite"
filename: sqlConfig.database,
@ -575,6 +576,7 @@ export default class SqlMgr {
return 1433;
break;
case 'sqlite3':
case 'better-sqlite3':
return 0;
break;
default:

2
packages/nocodb/src/lib/db/sql-mgr/code/gql-schema/xc-ts/GqlXcSchemaFactory.ts
Unescape View File

@ -11,7 +11,7 @@ class GqlXcSchemaFactory {
connectionConfig.client === 'mysql'
) {
return new GqlXcTsSchemaMysql(args);
} else if (connectionConfig.client === 'sqlite3') {
} else if (connectionConfig.client === 'sqlite3' || connectionConfig.client === 'better-sqlite3') {
return new GqlXcSchemaSqlite(args);
} else if (connectionConfig.client === 'mssql') {
return new GqlXcSchemaMssql(args);

2
packages/nocodb/src/lib/db/sql-mgr/code/models/xc/ModelXcMetaFactory.ts
Unescape View File

@ -12,7 +12,7 @@ class ModelXcMetaFactory {
connectionConfig.client === 'mysql'
) {
return new ModelXcMetaMysql(args);
} else if (connectionConfig.client === 'sqlite3') {
} else if (connectionConfig.client === 'sqlite3' || connectionConfig.client === 'better-sqlite3') {
return new ModelXcMetaSqlite(args);
} else if (connectionConfig.client === 'mssql') {
return new ModelXcMetaMssql(args);

1
packages/nocodb/src/lib/db/sql-mgr/code/routers/xc-ts/SwaggerTypes.ts
Unescape View File

@ -13,6 +13,7 @@ class SwaggerTypes {
SwaggerTypes.setSwaggerTypeForMssql(column, field);
break;
case 'sqlite3':
case 'better-sqlite3':
SwaggerTypes.setSwaggerTypeForSqlite(column, field);
break;
}

4
packages/nocodb/src/lib/db/sql-migrator/lib/KnexMigrator.ts
Unescape View File

@ -389,7 +389,7 @@ export default class KnexMigrator extends SqlMigrator {
await sqlClient.createDatabaseIfNotExists({
database: connectionConfig.connection.user,
});
} else if (connectionConfig.client !== 'sqlite3') {
} else if (connectionConfig.client !== 'sqlite3' && connectionConfig.client !== 'better-sqlite3') {
this.emit(
`${connectionConfig.client}: Creating DB if not exists ${connectionConfig.connection.database}`
);
@ -433,7 +433,7 @@ export default class KnexMigrator extends SqlMigrator {
await sqlClient.dropDatabase({
database: connectionConfig.connection.user,
});
} else if (connectionConfig.client === 'sqlite3') {
} else if (connectionConfig.client !== 'sqlite3' && connectionConfig.client === 'better-sqlite3') {
this.emit(
`Dropping DB : ${connectionConfig.connection.connection.filename}`
);

4
packages/nocodb/src/lib/db/sql-migrator/lib/KnexMigratorv2.ts
Unescape View File

@ -391,7 +391,7 @@ export default class KnexMigratorv2 {
await sqlClient.createDatabaseIfNotExists({
database: connectionConfig.connection.user,
});
} else if (connectionConfig.client !== 'sqlite3') {
} else if (connectionConfig.client !== 'sqlite3' && connectionConfig.client !== 'better-sqlite3') {
this.emit(
`${connectionConfig.client}: Creating DB if not exists ${connectionConfig.connection.database}`
);
@ -439,7 +439,7 @@ export default class KnexMigratorv2 {
await sqlClient.dropDatabase({
database: connectionConfig.connection.user,
});
} else if (connectionConfig.client === 'sqlite3') {
} else if (connectionConfig.client !== 'sqlite3' && connectionConfig.client === 'better-sqlite3') {
this.emit(
`Dropping DB : ${connectionConfig.connection.connection.filename}`
);

1
packages/nocodb/src/lib/db/sql-migrator/lib/SqlMigratorFactory.ts
Unescape View File

@ -9,6 +9,7 @@ export default class SqlMigratorFactory {
case 'oracledb':
case 'mssql':
case 'sqlite3':
case 'better-sqlite3':
return new KnexMigrator();
break;
default:

8
packages/nocodb/src/lib/db/sql-migrator/lib/templates/sqlite.template.ts
Unescape View File

@ -8,9 +8,9 @@ module.exports = {
_noco: {
db: [
{
client: 'sqlite3',
client: 'better-sqlite3',
connection: {
client: 'sqlite3',
client: 'better-sqlite3',
connection: {
filename:
DOCKER_DB_FILE ||
@ -29,9 +29,9 @@ module.exports = {
api: {},
db: [
{
client: 'sqlite3',
client: 'better-sqlite3',
connection: {
client: 'sqlite3',
client: 'better-sqlite3',
connection: {
filename:
DOCKER_DB_FILE ||

2
packages/nocodb/src/lib/meta/MetaAPILogger.ts
Unescape View File

@ -7,7 +7,7 @@ export default class MetaAPILogger {
constructor() {
this.knex = XKnex({
client: 'sqlite3',
client: 'better-sqlite3',
connection: {
filename: 'noco_log.db',
},

2
packages/nocodb/src/lib/meta/NcMetaIOImpl.ts
Unescape View File

@ -77,7 +77,7 @@ export default class NcMetaIOImpl extends NcMetaIO {
constructor(app: Noco, config: NcConfig, trx = null) {
super(app, config);
if (this.config?.meta?.db?.client === 'sqlite3') {
if (this.config?.meta?.db?.client === 'sqlite3' || this.config?.meta?.db?.client === 'better-sqlite3') {
this.config.meta.db.useNullAsDefault = true;
}

10
packages/nocodb/src/lib/meta/api/columnApis.ts
Unescape View File

@ -762,7 +762,7 @@ export async function columnUpdate(req: Request, res: Response<TableType>) {
});
if (colBody.colOptions?.options) {
const supportedDrivers = ['mysql', 'mysql2', 'pg', 'mssql', 'sqlite3'];
const supportedDrivers = ['mysql', 'mysql2', 'pg', 'mssql', 'sqlite3', 'better-sqlite3'];
const dbDriver = NcConnectionMgrv2.get(base);
const driverType = dbDriver.clientType();
@ -798,7 +798,7 @@ export async function columnUpdate(req: Request, res: Response<TableType>) {
column.column_name,
]
);
} else if (driverType === 'sqlite3') {
} else if (driverType === 'sqlite3' || driverType === 'better-sqlite3') {
await dbDriver.raw(
`UPDATE ?? SET ?? = substr(??, 1, instr(??, ',') - 1) WHERE ?? LIKE '%,%';`,
[
@ -992,7 +992,7 @@ export async function columnUpdate(req: Request, res: Response<TableType>) {
option.title,
]
);
} else if (driverType === 'sqlite3') {
} else if (driverType === 'sqlite3' || driverType === 'better-sqlite3') {
await dbDriver.raw(
`UPDATE ?? SET ?? = TRIM(REPLACE(',' || ?? || ',', ',' || ? || ',', ','), ',')`,
[
@ -1175,7 +1175,7 @@ export async function columnUpdate(req: Request, res: Response<TableType>) {
newOp.title,
]
);
} else if (driverType === 'sqlite3') {
} else if (driverType === 'sqlite3' || driverType === 'better-sqlite3') {
await dbDriver.raw(
`UPDATE ?? SET ?? = TRIM(REPLACE(',' || ?? || ',', ',' || ? || ',', ',' || ? || ','), ',')`,
[
@ -1263,7 +1263,7 @@ export async function columnUpdate(req: Request, res: Response<TableType>) {
newOp.title,
]
);
} else if (driverType === 'sqlite3') {
} else if (driverType === 'sqlite3' || driverType === 'better-sqlite3') {
await dbDriver.raw(
`UPDATE ?? SET ?? = TRIM(REPLACE(',' || ?? || ',', ',' || ? || ',', ',' || ? || ','), ',')`,
[

6
packages/nocodb/src/lib/meta/api/projectApis.ts
Unescape View File

@ -125,11 +125,11 @@ async function projectCreate(req: Request<any, any>, res) {
projectBody.prefix = '';
projectBody.bases = [
{
type: 'sqlite3',
type: 'better-sqlite3',
config: {
client: 'sqlite3',
client: 'better-sqlite3',
connection: {
client: 'sqlite3',
client: 'better-sqlite3',
database: projectTitle,
connection: {
filename: `${toolDir}/nc_minimal_dbs/${projectTitle}_${dbId}.db`,

198
packages/nocodb/src/lib/meta/api/sync/helpers/EntityMap.ts
Unescape View File

@ -1,139 +1,90 @@
import sqlite3 from 'sqlite3';
import sqlite3 from 'better-sqlite3';
import { Readable } from 'stream';
class EntityMap {
initialized: boolean;
cols: string[];
db: any;
constructor(...args) {
this.initialized = false;
this.cols = args.map((arg) => processKey(arg));
this.db = new Promise((resolve, reject) => {
const db = new sqlite3.Database(':memory:');
const colStatement =
this.cols.length > 0
? this.cols.join(' TEXT, ') + ' TEXT'
: 'mappingPlaceholder TEXT';
db.run(`CREATE TABLE mapping (${colStatement})`, (err) => {
if (err) {
console.log(err);
reject(err);
}
resolve(db);
});
});
}
async init() {
if (!this.initialized) {
this.db = await this.db;
this.initialized = true;
}
this.db = new sqlite3(':memory:');
const colStatement =
this.cols.length > 0
? this.cols.join(' TEXT, ') + ' TEXT'
: 'mappingPlaceholder TEXT';
const stmt = this.db.prepare(`CREATE TABLE mapping (${colStatement})`);
stmt.run();
}
destroy() {
if (this.initialized && this.db) {
if (this.db) {
this.db.close();
}
}
async addRow(row) {
if (!this.initialized) {
throw 'Please initialize first!';
}
addRow(row): void {
const cols = Object.keys(row).map((key) => processKey(key));
const colStatement = cols.map((key) => `'${key}'`).join(', ');
const questionMarks = cols.map(() => '?').join(', ');
const promises = [];
for (const col of cols.filter((col) => !this.cols.includes(col))) {
promises.push(
new Promise((resolve, reject) => {
this.db.run(`ALTER TABLE mapping ADD '${col}' TEXT;`, (err) => {
if (err) {
console.log(err);
reject(err);
}
this.cols.push(col);
resolve(true);
});
})
);
try {
const stmt = this.db.prepare(`ALTER TABLE mapping ADD '${col}' TEXT;`);
stmt.run();
this.cols.push(col);
} catch (e) {
console.log(e);
}
}
await Promise.all(promises);
const values = Object.values(row).map((val) => {
if (typeof val === 'object') {
if (typeof val === 'object' || typeof val === 'boolean') {
return `JSON::${JSON.stringify(val)}`;
}
return val;
return `${val}`;
});
return new Promise((resolve, reject) => {
this.db.run(
`INSERT INTO mapping (${colStatement}) VALUES (${questionMarks})`,
values,
(err) => {
if (err) {
console.log(err);
reject(err);
}
resolve(true);
}
try {
const stmt = this.db.prepare(
`INSERT INTO mapping (${colStatement}) VALUES (${questionMarks})`
);
});
stmt.run(values);
} catch (e) {
console.log(colStatement);
console.log(values);
console.log(e);
}
}
getRow(col, val, res = []): Promise<Record<string, any>> {
if (!this.initialized) {
throw 'Please initialize first!';
}
return new Promise((resolve, reject) => {
col = processKey(col);
res = res.map((r) => processKey(r));
this.db.get(
`SELECT ${
res.length ? res.join(', ') : '*'
} FROM mapping WHERE ${col} = ?`,
[val],
(err, rs) => {
if (err) {
console.log(err);
reject(err);
}
if (rs) {
rs = processResponseRow(rs);
}
resolve(rs);
}
getRow(col, val, res = []): Record<string, any> {
col = processKey(col);
res = res.map((r) => processKey(r));
try {
const stmt = this.db.prepare(
`SELECT ${res.length ? res.join(', ') : '*'} FROM mapping WHERE ${col} = ?`
);
});
const row = stmt.get(val);
return processResponseRow(row);
} catch (e) {
console.log(e);
return null;
}
}
getCount(): Promise<number> {
if (!this.initialized) {
throw 'Please initialize first!';
getCount(): number {
try {
const stmt = this.db.prepare(`SELECT COUNT(*) as count FROM mapping`);
const row = stmt.get();
return row.count;
} catch (e) {
console.log(e);
return 0;
}
return new Promise((resolve, reject) => {
this.db.get(`SELECT COUNT(*) as count FROM mapping`, (err, rs) => {
if (err) {
console.log(err);
reject(err);
}
resolve(rs.count);
});
});
}
getStream(res = []): DBStream {
if (!this.initialized) {
throw 'Please initialize first!';
}
res = res.map((r) => processKey(r));
return new DBStream(
this.db,
@ -141,28 +92,17 @@ class EntityMap {
);
}
getLimit(limit, offset, res = []): Promise<Record<string, any>[]> {
if (!this.initialized) {
throw 'Please initialize first!';
}
return new Promise((resolve, reject) => {
res = res.map((r) => processKey(r));
this.db.all(
`SELECT ${
res.length ? res.join(', ') : '*'
} FROM mapping LIMIT ${limit} OFFSET ${offset}`,
(err, rs) => {
if (err) {
console.log(err);
reject(err);
}
for (let row of rs) {
row = processResponseRow(row);
}
resolve(rs);
}
getLimit(limit, offset, res = []): Record<string, any>[] {
try {
const stmt = this.db.prepare(
`SELECT ${res.length ? res.join(', ') : '*'} FROM mapping LIMIT ${limit} OFFSET ${offset}`
);
});
const rows = stmt.all();
return rows.map(processResponseRow);
} catch (e) {
console.log(e);
return [];
}
}
}
@ -176,25 +116,19 @@ class DBStream extends Readable {
this.db = db;
this.sql = sql;
this.stmt = this.db.prepare(this.sql);
this.on('end', () => this.stmt.finalize());
}
_read() {
let stream = this;
this.stmt.get(function (err, result) {
if (err) {
stream.emit('error', err);
} else {
if (result) {
result = processResponseRow(result);
}
stream.push(result || null);
}
});
for (const row of this.stmt.iterate()) {
stream.push(processResponseRow(row));
}
stream.push(null);
}
}
function processResponseRow(res: any) {
function processResponseRow(res?: any) {
if (!res) return null;
for (const key of Object.keys(res)) {
if (res[key] && res[key].startsWith('JSON::')) {
try {

87
packages/nocodb/src/lib/meta/api/sync/helpers/job.ts
Unescape View File

@ -70,27 +70,26 @@ export default async (
progress: (data: { msg?: string; level?: any }) => void
) => {
const sMapEM = new EntityMap('aTblId', 'ncId', 'ncName', 'ncParent');
await sMapEM.init();
const sMap = {
// static mapping records between aTblId && ncId
async addToMappingTbl(aTblId, ncId, ncName, ncParent?) {
await sMapEM.addRow({ aTblId, ncId, ncName, ncParent });
addToMappingTbl(aTblId, ncId, ncName, ncParent?) {
sMapEM.addRow({ aTblId, ncId, ncName, ncParent });
},
// get NcID from airtable ID
async getNcIdFromAtId(aId) {
return (await sMapEM.getRow('aTblId', aId, ['ncId']))?.ncId;
getNcIdFromAtId(aId) {
return sMapEM.getRow('aTblId', aId, ['ncId'])?.ncId;
},
// get nc Parent from airtable ID
async getNcParentFromAtId(aId) {
return (await sMapEM.getRow('aTblId', aId, ['ncParent']))?.ncParent;
getNcParentFromAtId(aId) {
return sMapEM.getRow('aTblId', aId, ['ncParent'])?.ncParent;
},
// get nc-title from airtable ID
async getNcNameFromAtId(aId) {
return (await sMapEM.getRow('aTblId', aId, ['ncName']))?.ncName;
getNcNameFromAtId(aId) {
return sMapEM.getRow('aTblId', aId, ['ncName'])?.ncName;
},
};
@ -331,8 +330,8 @@ export default async (
// let ncCol = ncTbl.columns.find(x => x.title === aTblField.cn);
// return ncCol;
const ncTblId = await sMap.getNcParentFromAtId(aTblFieldId);
const ncColId = await sMap.getNcIdFromAtId(aTblFieldId);
const ncTblId = sMap.getNcParentFromAtId(aTblFieldId);
const ncColId = sMap.getNcIdFromAtId(aTblFieldId);
// not migrated column, skip
if (ncColId === undefined || ncTblId === undefined) return 0;
@ -460,7 +459,7 @@ export default async (
: tinycolor.random().toHexString(),
});
await sMap.addToMappingTbl(
sMap.addToMappingTbl(
(value as any).id,
undefined,
(value as any).name
@ -563,7 +562,7 @@ export default async (
if (col.type === 'text') ncCol.dt = 'text';
// #fix-2363-decimal-out-of-range
if (['sqlite3', 'mysql2'].includes(getRootDbType())) {
if (['sqlite3', 'better-sqlite3', 'mysql2'].includes(getRootDbType())) {
if (ncCol.uidt === UITypes.Decimal) {
ncCol.dt = 'double';
ncCol.dtxp = 22;
@ -623,14 +622,14 @@ export default async (
updateNcTblSchema(table);
// update mapping table
await sMap.addToMappingTbl(aTblSchema[idx].id, table.id, table.title);
sMap.addToMappingTbl(aTblSchema[idx].id, table.id, table.title);
for (let colIdx = 0; colIdx < table.columns.length; colIdx++) {
const aId = aTblSchema[idx].columns.find(
(x) =>
x.name.trim().replace(/\./g, '_') === table.columns[colIdx].title
)?.id;
if (aId)
await sMap.addToMappingTbl(
sMap.addToMappingTbl(
aId,
table.columns[colIdx].id,
table.columns[colIdx].title,
@ -654,7 +653,7 @@ export default async (
await updateNcTblSchemaById(table.id);
await sMap.addToMappingTbl(
sMap.addToMappingTbl(
aTbl_grid.id,
table.views[0].id,
aTbl_grid.name,
@ -699,7 +698,7 @@ export default async (
if (!nc_isLinkExists(aTblLinkColumns[i].id)) {
// parent table ID
// let srcTableId = (await nc_getTableSchema(aTblSchema[idx].name)).id;
const srcTableId = await sMap.getNcIdFromAtId(aTblSchema[idx].id);
const srcTableId = sMap.getNcIdFromAtId(aTblSchema[idx].id);
// find child table name from symmetric column ID specified
// self link, symmetricColumnId field will be undefined
@ -750,7 +749,7 @@ export default async (
const ncId = ncTbl.columns.find(
(x) => x.title === ncName.title
)?.id;
await sMap.addToMappingTbl(
sMap.addToMappingTbl(
aTblLinkColumns[i].id,
ncId,
ncName.title,
@ -891,7 +890,7 @@ export default async (
const ncId = ncTbl.columns.find(
(x) => x.title === aTblLinkColumns[i].name + suffix
)?.id;
await sMap.addToMappingTbl(
sMap.addToMappingTbl(
aTblLinkColumns[i].id,
ncId,
aTblLinkColumns[i].name + suffix,
@ -914,7 +913,7 @@ export default async (
// parent table ID
// let srcTableId = (await nc_getTableSchema(aTblSchema[idx].name)).id;
const srcTableId = await sMap.getNcIdFromAtId(aTblSchema[idx].id);
const srcTableId = sMap.getNcIdFromAtId(aTblSchema[idx].id);
const srcTableSchema = ncSchema.tablesById[srcTableId];
if (aTblColumns.length) {
@ -942,10 +941,10 @@ export default async (
continue;
}
const ncRelationColumnId = await sMap.getNcIdFromAtId(
const ncRelationColumnId = sMap.getNcIdFromAtId(
aTblColumns[i].typeOptions.relationColumnId
);
const ncLookupColumnId = await sMap.getNcIdFromAtId(
const ncLookupColumnId = sMap.getNcIdFromAtId(
aTblColumns[i].typeOptions.foreignTableRollupColumnId
);
@ -979,7 +978,7 @@ export default async (
const ncId = ncTbl.columns.find(
(x) => x.title === aTblColumns[i].name
)?.id;
await sMap.addToMappingTbl(
sMap.addToMappingTbl(
aTblColumns[i].id,
ncId,
aTblColumns[i].name,
@ -1018,10 +1017,10 @@ export default async (
const srcTableId = nestedLookupTbl[0].srcTableId;
const srcTableSchema = ncSchema.tablesById[srcTableId];
const ncRelationColumnId = await sMap.getNcIdFromAtId(
const ncRelationColumnId = sMap.getNcIdFromAtId(
nestedLookupTbl[0].typeOptions.relationColumnId
);
const ncLookupColumnId = await sMap.getNcIdFromAtId(
const ncLookupColumnId = sMap.getNcIdFromAtId(
nestedLookupTbl[0].typeOptions.foreignTableRollupColumnId
);
@ -1059,7 +1058,7 @@ export default async (
const ncId = ncTbl.columns.find(
(x) => x.title === nestedLookupTbl[0].name
)?.id;
await sMap.addToMappingTbl(
sMap.addToMappingTbl(
nestedLookupTbl[0].id,
ncId,
nestedLookupTbl[0].name,
@ -1104,7 +1103,7 @@ export default async (
// parent table ID
// let srcTableId = (await nc_getTableSchema(aTblSchema[idx].name)).id;
const srcTableId = await sMap.getNcIdFromAtId(aTblSchema[idx].id);
const srcTableId = sMap.getNcIdFromAtId(aTblSchema[idx].id);
const srcTableSchema = ncSchema.tablesById[srcTableId];
if (aTblColumns.length) {
@ -1149,10 +1148,10 @@ export default async (
continue;
}
const ncRelationColumnId = await sMap.getNcIdFromAtId(
const ncRelationColumnId = sMap.getNcIdFromAtId(
aTblColumns[i].typeOptions.relationColumnId
);
const ncRollupColumnId = await sMap.getNcIdFromAtId(
const ncRollupColumnId = sMap.getNcIdFromAtId(
aTblColumns[i].typeOptions.foreignTableRollupColumnId
);
@ -1203,7 +1202,7 @@ export default async (
const ncId = ncTbl.columns.find(
(x) => x.title === aTblColumns[i].name
)?.id;
await sMap.addToMappingTbl(
sMap.addToMappingTbl(
aTblColumns[i].id,
ncId,
aTblColumns[i].name,
@ -1222,10 +1221,10 @@ export default async (
const srcTableId = nestedLookupTbl[0].srcTableId;
const srcTableSchema = ncSchema.tablesById[srcTableId];
const ncRelationColumnId = await sMap.getNcIdFromAtId(
const ncRelationColumnId = sMap.getNcIdFromAtId(
nestedLookupTbl[0].typeOptions.relationColumnId
);
const ncLookupColumnId = await sMap.getNcIdFromAtId(
const ncLookupColumnId = sMap.getNcIdFromAtId(
nestedLookupTbl[0].typeOptions.foreignTableRollupColumnId
);
@ -1260,7 +1259,7 @@ export default async (
const ncId = ncTbl.columns.find(
(x) => x.title === nestedLookupTbl[0].name
)?.id;
await sMap.addToMappingTbl(
sMap.addToMappingTbl(
nestedLookupTbl[0].id,
ncId,
nestedLookupTbl[0].name,
@ -1281,7 +1280,7 @@ export default async (
);
const pColId = aTblSchema[idx].primaryColumnId;
const ncColId = await sMap.getNcIdFromAtId(pColId);
const ncColId = sMap.getNcIdFromAtId(pColId);
// skip primary column configuration if we field not migrated
if (ncColId) {
@ -1291,7 +1290,7 @@ export default async (
recordPerfStats(_perfStart, 'dbTableColumn.primaryColumnSet');
// update schema
const ncTblId = await sMap.getNcIdFromAtId(aTblSchema[idx].id);
const ncTblId = sMap.getNcIdFromAtId(aTblSchema[idx].id);
await updateNcTblSchemaById(ncTblId);
}
}
@ -1581,7 +1580,7 @@ export default async (
async function nocoConfigureFormView(sDB, aTblSchema) {
if (!sDB.options.syncViews) return;
for (let idx = 0; idx < aTblSchema.length; idx++) {
const tblId = await sMap.getNcIdFromAtId(aTblSchema[idx].id);
const tblId = sMap.getNcIdFromAtId(aTblSchema[idx].id);
const formViews = aTblSchema[idx].views.filter((x) => x.type === 'form');
const configuredViews = rtc.view.grid + rtc.view.gallery + rtc.view.form;
@ -1653,7 +1652,7 @@ export default async (
async function nocoConfigureGridView(sDB, aTblSchema) {
for (let idx = 0; idx < aTblSchema.length; idx++) {
const tblId = await sMap.getNcIdFromAtId(aTblSchema[idx].id);
const tblId = sMap.getNcIdFromAtId(aTblSchema[idx].id);
const gridViews = aTblSchema[idx].views.filter((x) => x.type === 'grid');
let viewCnt = idx;
@ -1692,7 +1691,7 @@ export default async (
recordPerfStats(_perfStart, 'dbView.gridCreate');
await updateNcTblSchemaById(tblId);
await sMap.addToMappingTbl(
sMap.addToMappingTbl(
gridViews[i].id,
viewCreated.id,
viewName,
@ -1969,7 +1968,7 @@ export default async (
// one of not migrated column;
if (!colSchema) {
updateMigrationSkipLog(
await sMap.getNcNameFromAtId(viewId),
sMap.getNcNameFromAtId(viewId),
colSchema.title,
colSchema.uidt,
`filter config skipped; column not migrated`
@ -1984,7 +1983,7 @@ export default async (
if (datatype === UITypes.Date || datatype === UITypes.DateTime) {
// skip filters over data datatype
updateMigrationSkipLog(
await sMap.getNcNameFromAtId(viewId),
sMap.getNcNameFromAtId(viewId),
colSchema.title,
colSchema.uidt,
`filter config skipped; filter over date datatype not supported`
@ -2004,7 +2003,7 @@ export default async (
fk_column_id: columnId,
logical_op: f.conjunction,
comparison_op: filterMap[filter.operator],
value: await sMap.getNcNameFromAtId(filter.value[i]),
value: sMap.getNcNameFromAtId(filter.value[i]),
};
ncFilters.push(fx);
}
@ -2015,7 +2014,7 @@ export default async (
fk_column_id: columnId,
logical_op: f.conjunction,
comparison_op: filterMap[filter.operator],
value: await sMap.getNcNameFromAtId(filter.value),
value: sMap.getNcNameFromAtId(filter.value),
};
ncFilters.push(fx);
}
@ -2111,7 +2110,7 @@ export default async (
// rest of the columns from airtable- retain order & visibility property
for (let j = 0; j < c.length; j++) {
const ncColumnId = await sMap.getNcIdFromAtId(c[j].columnId);
const ncColumnId = sMap.getNcIdFromAtId(c[j].columnId);
const ncViewColumnId = await nc_getViewColumnId(
viewId,
viewType,
@ -2257,7 +2256,7 @@ export default async (
sDB: syncDB,
logDetailed,
});
rtc.data.records += await recordsMap[ncTbl.id].getCount();
rtc.data.records += recordsMap[ncTbl.id].getCount();
logDetailed(`Data inserted from ${ncTbl.title}`);
}

7
packages/nocodb/src/lib/meta/api/sync/helpers/readAndProcessData.ts
Unescape View File

@ -33,14 +33,13 @@ async function readAllData({
async function page(records, fetchNextPage) {
if (!data) {
data = new EntityMap();
await data.init();
}
for await (const record of records) {
await data.addRow({ id: record.id, ...record.fields });
for (const record of records) {
data.addRow({ id: record.id, ...record.fields });
}
const tmpLength = await data.getCount();
const tmpLength = data.getCount();
logBasic(
`:: Reading '${table.title}' data :: ${Math.max(

4
packages/nocodb/src/lib/migrations/v2/nc_012_alter_column_data_types.ts
Unescape View File

@ -2,7 +2,7 @@ import { Knex } from 'knex';
import { MetaTable } from '../../utils/globals';
const up = async (knex: Knex) => {
if (knex.client.config.client !== 'sqlite3') {
if (knex.client.config.client !== 'sqlite3' && knex.client.config.client !== 'better-sqlite3') {
await knex.schema.alterTable(MetaTable.COLUMNS, (table) => {
table.text('cdf').alter();
});
@ -19,7 +19,7 @@ const up = async (knex: Knex) => {
};
const down = async (knex) => {
if (knex.client.config.client !== 'sqlite3') {
if (knex.client.config.client !== 'sqlite3' && knex.client.config.client !== 'better-sqlite3') {
await knex.schema.alterTable(MetaTable.COLUMNS, (table) => {
table.string('cdf').alter();
});

4
packages/nocodb/src/lib/migrations/v2/nc_014_alter_column_data_types.ts
Unescape View File

@ -2,7 +2,7 @@ import { Knex } from 'knex';
import { MetaTable } from '../../utils/globals';
const up = async (knex: Knex) => {
if (knex.client.config.client !== 'sqlite3') {
if (knex.client.config.client !== 'sqlite3' && knex.client.config.client !== 'better-sqlite3') {
await knex.schema.alterTable(MetaTable.FORM_VIEW, (table) => {
table.text('success_msg').alter();
});
@ -22,7 +22,7 @@ const up = async (knex: Knex) => {
};
const down = async (knex) => {
if (knex.client.config.client !== 'sqlite3') {
if (knex.client.config.client !== 'sqlite3' && knex.client.config.client !== 'better-sqlite3') {
await knex.schema.alterTable(MetaTable.FORM_VIEW, (table) => {
table.string('success_msg').alter();
});

4
packages/nocodb/src/lib/migrations/v2/nc_016_alter_hooklog_payload_types.ts
Unescape View File

@ -9,7 +9,7 @@ const up = async (knex: Knex) => {
await knex.schema.alterTable(MetaTable.HOOK_LOGS, (table) => {
table.text('payload');
});
} else if (knex.client.config.client !== 'sqlite3') {
} else if (knex.client.config.client !== 'sqlite3' && knex.client.config.client !== 'better-sqlite3') {
await knex.schema.alterTable(MetaTable.HOOK_LOGS, (table) => {
table.text('payload').alter();
});
@ -17,7 +17,7 @@ const up = async (knex: Knex) => {
};
const down = async (knex) => {
if (knex.client.config.client !== 'sqlite3') {
if (knex.client.config.client !== 'sqlite3' && knex.client.config.client !== 'better-sqlite3') {
await knex.schema.alterTable(MetaTable.HOOK_LOGS, (table) => {
table.boolean('payload').alter();
});

4
packages/nocodb/src/lib/models/Base.ts
Unescape View File

@ -101,7 +101,7 @@ export default class Base implements BaseType {
if (this.is_meta) {
const metaConfig = Noco.getConfig()?.meta?.db;
const config = { ...metaConfig };
if (config.client === 'sqlite3') {
if (config.client === 'sqlite3' || config.client === 'better-sqlite3') {
config.connection = metaConfig;
}
@ -116,7 +116,7 @@ export default class Base implements BaseType {
);
// todo: update sql-client args
if (config?.client === 'sqlite3') {
if (config?.client === 'sqlite3' || config?.client === 'better-sqlite3') {
config.connection.filename =
config.connection.filename || config.connection?.connection.filename;
}

26
packages/nocodb/src/lib/utils/NcConfigFactory.ts
Unescape View File

@ -23,7 +23,7 @@ const driverClientMapping = {
mariadb: 'mysql2',
postgres: 'pg',
postgresql: 'pg',
sqlite: 'sqlite3',
sqlite: 'better-sqlite3',
mssql: 'mssql',
};
@ -132,7 +132,7 @@ export default class NcConfigFactory implements NcConfig {
if (process.env.NC_TRY) {
ncConfig.try = true;
ncConfig.meta.db = {
client: 'sqlite3',
client: 'better-sqlite3',
connection: ':memory:',
pool: {
min: 1,
@ -189,11 +189,11 @@ export default class NcConfigFactory implements NcConfig {
let dbConfig: DbConfig;
if (url.protocol.startsWith('sqlite3')) {
if (url.protocol.startsWith('sqlite3') || url.protocol.startsWith('better-sqlite3')) {
dbConfig = {
client: 'sqlite3',
client: 'better-sqlite3',
connection: {
client: 'sqlite3',
client: 'better-sqlite3',
connection: {
filename:
url.searchParams.get('d') || url.searchParams.get('database'),
@ -297,10 +297,10 @@ export default class NcConfigFactory implements NcConfig {
let dbConfig;
if (url.protocol.startsWith('sqlite3')) {
if (url.protocol.startsWith('sqlite3') || url.protocol.startsWith('better-sqlite3')) {
const db = url.searchParams.get('d') || url.searchParams.get('database');
dbConfig = {
client: 'sqlite3',
client: 'better-sqlite3',
connection: {
filename: db,
},
@ -437,7 +437,7 @@ export default class NcConfigFactory implements NcConfig {
if (process.env.NC_TRY) {
config.try = true;
config.meta.db = {
client: 'sqlite3',
client: 'better-sqlite3',
connection: ':memory:',
pool: {
min: 1,
@ -490,9 +490,9 @@ export default class NcConfigFactory implements NcConfig {
const config = new NcConfigFactory();
let dbConfig = dbConnectionConfig;
if (dbConfig.client === 'sqlite3') {
if (dbConfig.client === 'sqlite3' || dbConfig.client === 'better-sqlite3') {
dbConfig = {
client: 'sqlite3',
client: 'better-sqlite3',
connection: {
...dbConnectionConfig,
database: dbConnectionConfig.connection.filename,
@ -553,7 +553,7 @@ export default class NcConfigFactory implements NcConfig {
if (process.env.NC_TRY) {
config.try = true;
config.meta.db = {
client: 'sqlite3',
client: 'better-sqlite3',
connection: ':memory:',
pool: {
min: 1,
@ -585,7 +585,7 @@ export default class NcConfigFactory implements NcConfig {
}
public static async metaDbCreateIfNotExist(args: NcConfig) {
if (args.meta?.db?.client === 'sqlite3') {
if (args.meta?.db?.client === 'sqlite3' || args.meta?.db?.client === 'better-sqlite3') {
const metaSqlClient = SqlClientFactory.create({
...args.meta.db,
connection: args.meta.db,
@ -624,7 +624,7 @@ export default class NcConfigFactory implements NcConfig {
public projectType;
public meta = {
db: {
client: 'sqlite3',
client: 'better-sqlite3',
connection: {
filename: 'noco.db',
},

2
packages/nocodb/src/lib/utils/common/NcConnectionMgr.ts
Unescape View File

@ -95,7 +95,7 @@ export default class NcConnectionMgr {
}
}
const isSqlite = connectionConfig?.client === 'sqlite3';
const isSqlite = connectionConfig?.client === 'sqlite3' || connectionConfig?.client === 'better-sqlite3';
if (connectionConfig?.connection?.port) {
connectionConfig.connection.port = +connectionConfig.connection.port;

4
packages/nocodb/src/lib/v1-legacy/templates/NcTemplateParser.ts
Unescape View File

@ -171,7 +171,7 @@ export default class NcTemplateParser {
onUpdate: 'NO ACTION',
parentColumn: parentPrimaryColumn.cn,
parentTable: tableTemplate.tn,
type: this.client === 'sqlite3' ? 'virtual' : 'real',
type: this.client === 'sqlite3' || this.client === 'better-sqlite3' ? 'virtual' : 'real',
updateRelation: false,
});
}
@ -213,7 +213,7 @@ export default class NcTemplateParser {
onUpdate: 'NO ACTION',
parentColumn: parentPrimaryColumn.cn,
parentTable: parentTable.tn,
type: this.client === 'sqlite3' ? 'virtual' : 'real',
type: this.client === 'sqlite3' || this.client === 'better-sqlite3' ? 'virtual' : 'real',
updateRelation: false,
});
}

4
packages/nocodb/tests/unit/TestDbMngr.ts
Unescape View File

@ -142,7 +142,7 @@ export default class TestDbMngr {
static async switchToSqlite() {
// process.env[`DATABASE_URL`] = `sqlite3:///?database=${__dirname}/${TestDbMngr.dbName}.sqlite`;
TestDbMngr.dbConfig = {
client: 'sqlite3',
client: 'better-sqlite3',
connection: {
filename: `${__dirname}/${TestDbMngr.dbName}.db`,
database: TestDbMngr.dbName,
@ -182,7 +182,7 @@ export default class TestDbMngr {
}
static isSqlite() {
return TestDbMngr.dbConfig.client === 'sqlite3';
return TestDbMngr.dbConfig.client === 'sqlite3' || TestDbMngr.dbConfig.client === 'better-sqlite3';
}
private static async useDatabase(knexClient, dbName) {

2
packages/nocodb/tests/unit/init/db.ts
Unescape View File

@ -2,7 +2,7 @@ import { DbConfig } from "../../../src/interface/config";
const isSqlite = (context) =>{
return (context.dbConfig as DbConfig).client === 'sqlite' || (context.dbConfig as DbConfig).client === 'sqlite3';
return (context.dbConfig as DbConfig).client === 'sqlite' || (context.dbConfig as DbConfig).client === 'sqlite3' || (context.dbConfig as DbConfig).client === 'better-sqlite3';
}
const isMysql = (context) =>

Write Preview
Loading…
Cancel
Save