Merge remote-tracking branch 'origin/master' into dean-fixes
This commit is contained in:
commit
5ccbec9668
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
|
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
|
||||||
"version": "2.29.30",
|
"version": "2.30.1",
|
||||||
"npmClient": "yarn",
|
"npmClient": "yarn",
|
||||||
"packages": [
|
"packages": [
|
||||||
"packages/*",
|
"packages/*",
|
||||||
|
|
|
@ -700,6 +700,8 @@ class InternalBuilder {
|
||||||
const direction =
|
const direction =
|
||||||
value.direction === SortOrder.ASCENDING ? "asc" : "desc"
|
value.direction === SortOrder.ASCENDING ? "asc" : "desc"
|
||||||
|
|
||||||
|
// TODO: figure out a way to remove this conditional, not relying on
|
||||||
|
// the defaults of each datastore.
|
||||||
let nulls: "first" | "last" | undefined = undefined
|
let nulls: "first" | "last" | undefined = undefined
|
||||||
if (
|
if (
|
||||||
this.client === SqlClient.POSTGRES ||
|
this.client === SqlClient.POSTGRES ||
|
||||||
|
|
|
@ -1596,9 +1596,6 @@ describe.each([
|
||||||
|
|
||||||
// Our bigints are int64s in most datasources.
|
// Our bigints are int64s in most datasources.
|
||||||
let BIG = "9223372036854775807"
|
let BIG = "9223372036854775807"
|
||||||
if (name === DatabaseName.ORACLE) {
|
|
||||||
// BIG = "9223372036854775808"
|
|
||||||
}
|
|
||||||
|
|
||||||
beforeAll(async () => {
|
beforeAll(async () => {
|
||||||
table = await createTable({
|
table = await createTable({
|
||||||
|
|
|
@ -506,6 +506,13 @@ class OracleIntegration extends Sql implements DatasourcePlus {
|
||||||
password: this.config.password,
|
password: this.config.password,
|
||||||
connectString,
|
connectString,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// We set the timezone of the connection to match the timezone of the
|
||||||
|
// Budibase server, this is because several column types (e.g. time-only
|
||||||
|
// timestamps) do not store timezone information, so to avoid storing one
|
||||||
|
// time and getting a different one back we need to make sure the timezone
|
||||||
|
// of the server matches the timezone of the database. There's an assumption
|
||||||
|
// here that the server is running in the same timezone as the database.
|
||||||
const tz = Intl.DateTimeFormat().resolvedOptions().timeZone
|
const tz = Intl.DateTimeFormat().resolvedOptions().timeZone
|
||||||
const connection = await oracledb.getConnection(attributes)
|
const connection = await oracledb.getConnection(attributes)
|
||||||
await connection.execute(`ALTER SESSION SET TIME_ZONE = '${tz}'`)
|
await connection.execute(`ALTER SESSION SET TIME_ZONE = '${tz}'`)
|
||||||
|
|
|
@ -182,6 +182,7 @@ export enum BpmStatusValue {
|
||||||
COMPLETING_ACCOUNT_INFO = "completing_account_info",
|
COMPLETING_ACCOUNT_INFO = "completing_account_info",
|
||||||
VERIFYING_EMAIL = "verifying_email",
|
VERIFYING_EMAIL = "verifying_email",
|
||||||
COMPLETED = "completed",
|
COMPLETED = "completed",
|
||||||
|
FAILED = "failed",
|
||||||
}
|
}
|
||||||
|
|
||||||
export const DEFAULT_BB_DATASOURCE_ID = "datasource_internal_bb_default"
|
export const DEFAULT_BB_DATASOURCE_ID = "datasource_internal_bb_default"
|
||||||
|
|
Loading…
Reference in New Issue