@budibase/backend-core 2.29.1 → 2.29.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.js +103 -98
- package/dist/index.js.map +4 -4
- package/dist/index.js.meta.json +1 -1
- package/dist/package.json +4 -4
- package/dist/plugins.js.meta.json +1 -1
- package/dist/src/constants/db.d.ts +1 -1
- package/dist/src/constants/db.js +2 -1
- package/dist/src/constants/db.js.map +1 -1
- package/dist/src/sql/sql.js +7 -3
- package/dist/src/sql/sql.js.map +1 -1
- package/dist/src/sql/sqlTable.js +2 -2
- package/dist/src/sql/sqlTable.js.map +1 -1
- package/dist/src/sql/utils.d.ts +2 -5
- package/dist/src/sql/utils.js +3 -3
- package/dist/src/sql/utils.js.map +1 -1
- package/dist/tests/core/utilities/structures/accounts.js +1 -1
- package/dist/tests/core/utilities/structures/accounts.js.map +1 -1
- package/package.json +4 -4
- package/src/constants/db.ts +1 -1
- package/src/sql/sql.ts +8 -3
- package/src/sql/sqlTable.ts +4 -2
- package/src/sql/utils.ts +4 -4
- package/tests/core/utilities/structures/accounts.ts +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sqlTable.js","sourceRoot":"","sources":["../../../src/sql/sqlTable.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"sqlTable.js","sourceRoot":"","sources":["../../../src/sql/sqlTable.ts"],"names":[],"mappings":"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"}
|
package/dist/src/sql/utils.d.ts
CHANGED
|
@@ -5,11 +5,8 @@ export declare function isInternalTableID(tableId: string): boolean;
|
|
|
5
5
|
export declare function getNativeSql(query: Knex.SchemaBuilder | Knex.QueryBuilder): SqlQuery | SqlQuery[];
|
|
6
6
|
export declare function isExternalTable(table: Table): boolean;
|
|
7
7
|
export declare function buildExternalTableId(datasourceId: string, tableName: string): string;
|
|
8
|
-
export declare function breakExternalTableId(tableId: string
|
|
9
|
-
datasourceId
|
|
10
|
-
tableName?: undefined;
|
|
11
|
-
} | {
|
|
12
|
-
datasourceId: string | undefined;
|
|
8
|
+
export declare function breakExternalTableId(tableId: string): {
|
|
9
|
+
datasourceId: string;
|
|
13
10
|
tableName: string;
|
|
14
11
|
};
|
|
15
12
|
export declare function generateRowIdField(keyProps?: any[]): string;
|
package/dist/src/sql/utils.js
CHANGED
|
@@ -54,9 +54,6 @@ function buildExternalTableId(datasourceId, tableName) {
|
|
|
54
54
|
}
|
|
55
55
|
exports.buildExternalTableId = buildExternalTableId;
|
|
56
56
|
function breakExternalTableId(tableId) {
|
|
57
|
-
if (!tableId) {
|
|
58
|
-
return {};
|
|
59
|
-
}
|
|
60
57
|
const parts = tableId.split(DOUBLE_SEPARATOR);
|
|
61
58
|
let datasourceId = parts.shift();
|
|
62
59
|
// if they need joined
|
|
@@ -65,6 +62,9 @@ function breakExternalTableId(tableId) {
|
|
|
65
62
|
if (tableName.includes(ENCODED_SPACE)) {
|
|
66
63
|
tableName = decodeURIComponent(tableName);
|
|
67
64
|
}
|
|
65
|
+
if (!datasourceId || !tableName) {
|
|
66
|
+
throw new Error("Unable to get datasource/table name from table ID");
|
|
67
|
+
}
|
|
68
68
|
return { datasourceId, tableName };
|
|
69
69
|
}
|
|
70
70
|
exports.breakExternalTableId = breakExternalTableId;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/sql/utils.ts"],"names":[],"mappings":";;;AAAA,2CAAgF;AAChF,4CAAuD;AAEvD,8BAAiC;AAEjC,MAAM,gBAAgB,GAAG,GAAG,cAAS,GAAG,cAAS,EAAE,CAAA;AACnD,MAAM,YAAY,GAAG,UAAU,CAAA;AAC/B,MAAM,aAAa,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAA;AAE7C,SAAgB,iBAAiB,CAAC,OAAe;IAC/C,OAAO,OAAO,CAAC,UAAU,CAAC,oBAAY,CAAC,UAAU,GAAG,cAAS,CAAC,CAAA;AAChE,CAAC;AAFD,8CAEC;AAED,SAAgB,iBAAiB,CAAC,OAAe;IAC/C,OAAO,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAA;AACpC,CAAC;AAFD,8CAEC;AAED,SAAgB,YAAY,CAC1B,KAA6C;IAE7C,IAAI,GAAG,GAAG,KAAK,CAAC,KAAK,EAAE,CAAA;IACvB,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QACtB,OAAO,GAAiB,CAAA;KACzB;IACD,IAAI,MAAkC,CAAA;IACtC,IAAI,GAAG,CAAC,QAAQ,EAAE;QAChB,MAAM,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAA;KACxB;IACD,OAAO;QACL,GAAG,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,GAAG,KAAI,GAAG,CAAC,GAAG;QAC3B,QAAQ,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,KAAI,GAAG,CAAC,QAAQ;KAC/B,CAAA;AACf,CAAC;AAfD,oCAeC;AAED,SAAgB,eAAe,CAAC,KAAY;IAC1C,IACE,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ;QACf,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,oBAAY,CAAC,UAAU,GAAG,cAAS,CAAC;QAC5D,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,MAAK,oCAAwB,EAC5C;QACA,OAAO,IAAI,CAAA;KACZ;SAAM,IAAI,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,UAAU,MAAK,uBAAe,CAAC,QAAQ,EAAE;QACzD,OAAO,IAAI,CAAA;KACZ;SAAM,IAAI,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,GAAG,KAAI,iBAAiB,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;QACrD,OAAO,IAAI,CAAA;KACZ;IACD,OAAO,KAAK,CAAA;AACd,CAAC;AAbD,0CAaC;AAED,SAAgB,oBAAoB,CAAC,YAAoB,EAAE,SAAiB;IAC1E,gBAAgB;IAChB,IAAI,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QAC3B,SAAS,GAAG,kBAAkB,CAAC,SAAS,CAAC,CAAA;KAC1C;IACD,OAAO,GAAG,YAAY,GAAG,gBAAgB,GAAG,SAAS,EAAE,CAAA;AACzD,CAAC;AAND,oDAMC;AAED,SAAgB,oBAAoB,CAAC,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/sql/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ const docIds_1 = require("../../../../src/docIds");
|
|
|
9
9
|
const types_1 = require("@budibase/types");
|
|
10
10
|
const sample_1 = __importDefault(require("lodash/sample"));
|
|
11
11
|
const account = (partial = {}) => {
|
|
12
|
-
return Object.assign({ accountId: (0, _1.uuid)(), tenantId: _1.generator.word(), email: _1.generator.email({ domain: "example.com" }), tenantName: _1.generator.word(), hosting: types_1.Hosting.SELF, createdAt: Date.now(), verified: true, verificationSent: true,
|
|
12
|
+
return Object.assign({ accountId: (0, _1.uuid)(), tenantId: _1.generator.word(), email: _1.generator.email({ domain: "example.com" }), tenantName: _1.generator.word(), hosting: types_1.Hosting.SELF, createdAt: Date.now(), verified: true, verificationSent: true, authType: types_1.AuthType.PASSWORD, name: _1.generator.name(), size: "10+", profession: "Software Engineer", quotaUsage: _1.quotas.usage() }, partial);
|
|
13
13
|
};
|
|
14
14
|
exports.account = account;
|
|
15
15
|
function selfHostAccount() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accounts.js","sourceRoot":"","sources":["../../../../../tests/core/utilities/structures/accounts.ts"],"names":[],"mappings":";;;;;;AAAA,wBAA2C;AAC3C,mDAA6D;AAC7D,2CAWwB;AACxB,2DAAkC;AAE3B,MAAM,OAAO,GAAG,CAAC,UAA4B,EAAE,EAAW,EAAE;IACjE,uBACE,SAAS,EAAE,IAAA,OAAI,GAAE,EACjB,QAAQ,EAAE,YAAS,CAAC,IAAI,EAAE,EAC1B,KAAK,EAAE,YAAS,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,EACjD,UAAU,EAAE,YAAS,CAAC,IAAI,EAAE,EAC5B,OAAO,EAAE,eAAO,CAAC,IAAI,EACrB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,EACrB,QAAQ,EAAE,IAAI,EACd,gBAAgB,EAAE,IAAI,EACtB,
|
|
1
|
+
{"version":3,"file":"accounts.js","sourceRoot":"","sources":["../../../../../tests/core/utilities/structures/accounts.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@budibase/backend-core",
|
|
3
|
-
"version": "2.29.
|
|
3
|
+
"version": "2.29.2",
|
|
4
4
|
"description": "Budibase backend core libraries used in server and worker",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/src/index.d.ts",
|
|
@@ -23,8 +23,8 @@
|
|
|
23
23
|
"dependencies": {
|
|
24
24
|
"@budibase/nano": "10.1.5",
|
|
25
25
|
"@budibase/pouchdb-replication-stream": "1.2.10",
|
|
26
|
-
"@budibase/shared-core": "2.29.
|
|
27
|
-
"@budibase/types": "2.29.
|
|
26
|
+
"@budibase/shared-core": "2.29.2",
|
|
27
|
+
"@budibase/types": "2.29.2",
|
|
28
28
|
"@govtechsg/passport-openidconnect": "^1.0.2",
|
|
29
29
|
"aws-cloudfront-sign": "3.0.2",
|
|
30
30
|
"aws-sdk": "2.1030.0",
|
|
@@ -96,5 +96,5 @@
|
|
|
96
96
|
}
|
|
97
97
|
}
|
|
98
98
|
},
|
|
99
|
-
"gitHead": "
|
|
99
|
+
"gitHead": "d77bd029bbaad8e29e3bebb7073db33fb8193691"
|
|
100
100
|
}
|
package/src/constants/db.ts
CHANGED
|
@@ -72,4 +72,4 @@ export const DEFAULT_JOBS_TABLE_ID = "ta_bb_jobs"
|
|
|
72
72
|
export const DEFAULT_INVENTORY_TABLE_ID = "ta_bb_inventory"
|
|
73
73
|
export const DEFAULT_EXPENSES_TABLE_ID = "ta_bb_expenses"
|
|
74
74
|
export const DEFAULT_EMPLOYEE_TABLE_ID = "ta_bb_employee"
|
|
75
|
-
export
|
|
75
|
+
export { DEFAULT_BB_DATASOURCE_ID } from "@budibase/shared-core"
|
package/src/sql/sql.ts
CHANGED
|
@@ -449,8 +449,12 @@ class InternalBuilder {
|
|
|
449
449
|
query = query.orderBy(`${aliased}.${key}`, direction, nulls)
|
|
450
450
|
}
|
|
451
451
|
}
|
|
452
|
-
|
|
453
|
-
|
|
452
|
+
|
|
453
|
+
// add sorting by the primary key if the result isn't already sorted by it,
|
|
454
|
+
// to make sure result is deterministic
|
|
455
|
+
if (!sort || sort[primaryKey[0]] === undefined) {
|
|
456
|
+
query = query.orderBy(`${aliased}.${primaryKey[0]}`)
|
|
457
|
+
}
|
|
454
458
|
return query
|
|
455
459
|
}
|
|
456
460
|
|
|
@@ -604,7 +608,8 @@ class InternalBuilder {
|
|
|
604
608
|
if (!primary) {
|
|
605
609
|
throw new Error("Primary key is required for upsert")
|
|
606
610
|
}
|
|
607
|
-
|
|
611
|
+
const ret = query.insert(parsedBody).onConflict(primary).merge()
|
|
612
|
+
return ret
|
|
608
613
|
} else if (this.client === SqlClient.MS_SQL) {
|
|
609
614
|
// No upsert or onConflict support in MSSQL yet, see:
|
|
610
615
|
// https://github.com/knex/knex/pull/6050
|
package/src/sql/sqlTable.ts
CHANGED
|
@@ -109,8 +109,10 @@ function generateSchema(
|
|
|
109
109
|
const { tableName } = breakExternalTableId(column.tableId)
|
|
110
110
|
// @ts-ignore
|
|
111
111
|
const relatedTable = tables[tableName]
|
|
112
|
-
if (!relatedTable) {
|
|
113
|
-
throw new Error(
|
|
112
|
+
if (!relatedTable || !relatedTable.primary) {
|
|
113
|
+
throw new Error(
|
|
114
|
+
"Referenced table doesn't exist or has no primary keys"
|
|
115
|
+
)
|
|
114
116
|
}
|
|
115
117
|
const relatedPrimary = relatedTable.primary[0]
|
|
116
118
|
const externalType = relatedTable.schema[relatedPrimary].externalType
|
package/src/sql/utils.ts
CHANGED
|
@@ -55,10 +55,7 @@ export function buildExternalTableId(datasourceId: string, tableName: string) {
|
|
|
55
55
|
return `${datasourceId}${DOUBLE_SEPARATOR}${tableName}`
|
|
56
56
|
}
|
|
57
57
|
|
|
58
|
-
export function breakExternalTableId(tableId: string
|
|
59
|
-
if (!tableId) {
|
|
60
|
-
return {}
|
|
61
|
-
}
|
|
58
|
+
export function breakExternalTableId(tableId: string) {
|
|
62
59
|
const parts = tableId.split(DOUBLE_SEPARATOR)
|
|
63
60
|
let datasourceId = parts.shift()
|
|
64
61
|
// if they need joined
|
|
@@ -67,6 +64,9 @@ export function breakExternalTableId(tableId: string | undefined) {
|
|
|
67
64
|
if (tableName.includes(ENCODED_SPACE)) {
|
|
68
65
|
tableName = decodeURIComponent(tableName)
|
|
69
66
|
}
|
|
67
|
+
if (!datasourceId || !tableName) {
|
|
68
|
+
throw new Error("Unable to get datasource/table name from table ID")
|
|
69
|
+
}
|
|
70
70
|
return { datasourceId, tableName }
|
|
71
71
|
}
|
|
72
72
|
|