Merge branch 'master' into chore/sqs-always-on

This commit is contained in:
Adria Navarro 2024-11-04 10:38:19 +01:00
commit 3b7d510d07
2 changed files with 6 additions and 6 deletions

View File

@ -71,8 +71,8 @@ describe.each([
])("search (%s)", (name, dsProvider) => { ])("search (%s)", (name, dsProvider) => {
const isInMemory = name === "in-memory" const isInMemory = name === "in-memory"
const isInternal = !dsProvider const isInternal = !dsProvider
const isSql = !isInMemory
const isOracle = name === DatabaseName.ORACLE const isOracle = name === DatabaseName.ORACLE
const isSql = !isInMemory
const config = setup.getConfig() const config = setup.getConfig()
let datasource: Datasource | undefined let datasource: Datasource | undefined
@ -1619,6 +1619,7 @@ describe.each([
}) })
isInternal && isInternal &&
!isInMemory &&
describe("AI Column", () => { describe("AI Column", () => {
const UNEXISTING_AI_COLUMN = "Real LLM Response" const UNEXISTING_AI_COLUMN = "Real LLM Response"
@ -3545,7 +3546,6 @@ describe.each([
}) })
!isInternal && !isInternal &&
!isInMemory &&
describe("SQL injection", () => { describe("SQL injection", () => {
const badStrings = [ const badStrings = [
"1; DROP TABLE %table_name%;", "1; DROP TABLE %table_name%;",

View File

@ -45,10 +45,10 @@ import { db, roles, features, context } from "@budibase/backend-core"
describe.each([ describe.each([
["sqs", undefined], ["sqs", undefined],
[DatabaseName.POSTGRES, getDatasource(DatabaseName.POSTGRES)], [DatabaseName.POSTGRES, getDatasource(DatabaseName.POSTGRES)],
[DatabaseName.MYSQL, getDatasource(DatabaseName.MYSQL)], // [DatabaseName.MYSQL, getDatasource(DatabaseName.MYSQL)],
[DatabaseName.SQL_SERVER, getDatasource(DatabaseName.SQL_SERVER)], // [DatabaseName.SQL_SERVER, getDatasource(DatabaseName.SQL_SERVER)],
[DatabaseName.MARIADB, getDatasource(DatabaseName.MARIADB)], // [DatabaseName.MARIADB, getDatasource(DatabaseName.MARIADB)],
[DatabaseName.ORACLE, getDatasource(DatabaseName.ORACLE)], // [DatabaseName.ORACLE, getDatasource(DatabaseName.ORACLE)],
])("/v2/views (%s)", (name, dsProvider) => { ])("/v2/views (%s)", (name, dsProvider) => {
const config = setup.getConfig() const config = setup.getConfig()
const isInternal = name === "sqs" const isInternal = name === "sqs"