Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,7 @@ CREATE TABLE IF NOT EXISTS services_public.database_settings (
enable_connection_filter boolean NOT NULL DEFAULT true,
enable_ltree boolean NOT NULL DEFAULT true,
enable_llm boolean NOT NULL DEFAULT false,
enable_realtime boolean NOT NULL DEFAULT false,
options jsonb NOT NULL DEFAULT '{}'::jsonb,
CONSTRAINT ds_db_fkey FOREIGN KEY (database_id) REFERENCES metaschema_public.database (id) ON DELETE CASCADE
);
Expand All @@ -320,6 +321,7 @@ CREATE TABLE IF NOT EXISTS services_public.api_settings (
enable_connection_filter boolean,
enable_ltree boolean,
enable_llm boolean,
enable_realtime boolean,
options jsonb NOT NULL DEFAULT '{}'::jsonb,
CONSTRAINT as_db_fkey FOREIGN KEY (database_id) REFERENCES metaschema_public.database (id) ON DELETE CASCADE,
CONSTRAINT as_api_fkey FOREIGN KEY (api_id) REFERENCES services_public.apis (id) ON DELETE CASCADE
Expand Down
8 changes: 4 additions & 4 deletions graphql/server/src/middleware/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,8 @@ const DATABASE_SETTINGS_SQL = `
COALESCE(aps.enable_many_to_many, ds.enable_many_to_many) AS resolved_enable_many_to_many,
COALESCE(aps.enable_connection_filter, ds.enable_connection_filter) AS resolved_enable_connection_filter,
COALESCE(aps.enable_ltree, ds.enable_ltree) AS resolved_enable_ltree,
COALESCE(aps.enable_llm, ds.enable_llm) AS resolved_enable_llm
COALESCE(aps.enable_llm, ds.enable_llm) AS resolved_enable_llm,
COALESCE(aps.enable_realtime, ds.enable_realtime) AS resolved_enable_realtime
FROM services_public.database_settings ds
LEFT JOIN services_public.api_settings aps ON ds.database_id = aps.database_id AND aps.api_id = $2
WHERE ds.database_id = $1
Expand Down Expand Up @@ -325,6 +326,7 @@ interface DatabaseSettingsRow {
resolved_enable_connection_filter: boolean;
resolved_enable_ltree: boolean;
resolved_enable_llm: boolean;
resolved_enable_realtime: boolean;
}

interface ApiListRow {
Expand Down Expand Up @@ -672,9 +674,7 @@ const toDatabaseSettings = (row: DatabaseSettingsRow | null): DatabaseSettings |
enableConnectionFilter: row.resolved_enable_connection_filter,
enableLtree: row.resolved_enable_ltree,
enableLlm: row.resolved_enable_llm,
// Reads from the COALESCE cascade once constructive-db#1105 is merged and
// the enable_realtime column exists in database_settings / api_settings.
enableRealtime: false,
enableRealtime: row.resolved_enable_realtime,
};
};

Expand Down
Loading