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
2 changes: 1 addition & 1 deletion packages/database/.sqruff
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[sqruff]
dialect = postgres
# Exclude LT01 until https://github.com/quarylabs/sqruff/issues/1786 is solved.
exclude_rules = CP05,LT05
large_file_skip_byte_limit = 0

[sqruff:indentation]
indent_unit = space
Expand Down
36 changes: 18 additions & 18 deletions packages/database/supabase/schemas/account.sql
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ CREATE TABLE IF NOT EXISTS public."PlatformAccount" (
agent_type public."AgentType" NOT NULL DEFAULT 'person',
metadata JSONB NOT NULL DEFAULT '{}',
dg_account UUID,
FOREIGN KEY (dg_account) REFERENCES auth.users (id) ON DELETE SET NULL ON UPDATE CASCADE
FOREIGN KEY (dg_account) REFERENCES auth.users(id) ON DELETE SET NULL ON UPDATE CASCADE
);

ALTER TABLE public."PlatformAccount" OWNER TO "postgres";
Expand All @@ -54,7 +54,7 @@ CREATE TABLE public."AgentIdentifier" (
value VARCHAR NOT NULL,
trusted BOOLEAN NOT NULL DEFAULT false,
PRIMARY KEY (value, identifier_type, account_id),
FOREIGN KEY (account_id) REFERENCES public."PlatformAccount" (id)
FOREIGN KEY (account_id) REFERENCES public."PlatformAccount"(id)
);

ALTER TABLE public."AgentIdentifier" OWNER TO "postgres";
Expand Down Expand Up @@ -82,12 +82,12 @@ COMMENT ON COLUMN public."LocalAccess".account_id IS 'The identity of the local
ALTER TABLE ONLY public."LocalAccess"
ADD CONSTRAINT "LocalAccess_account_id_fkey" FOREIGN KEY (
account_id
) REFERENCES public."PlatformAccount" (id) ON UPDATE CASCADE ON DELETE CASCADE;
) REFERENCES public."PlatformAccount"(id) ON UPDATE CASCADE ON DELETE CASCADE;

ALTER TABLE ONLY public."LocalAccess"
ADD CONSTRAINT "LocalAccess_space_id_fkey" FOREIGN KEY (
space_id
) REFERENCES public."Space" (
) REFERENCES public."Space"(
id
) ON UPDATE CASCADE ON DELETE CASCADE;

Expand Down Expand Up @@ -120,12 +120,12 @@ COMMENT ON COLUMN public."SpaceAccess".permissions IS 'The permission this accou
ALTER TABLE ONLY public."SpaceAccess"
ADD CONSTRAINT "SpaceAccess_account_uid_fkey" FOREIGN KEY (
account_uid
) REFERENCES auth.users (id) ON UPDATE CASCADE ON DELETE CASCADE;
) REFERENCES auth.users(id) ON UPDATE CASCADE ON DELETE CASCADE;

ALTER TABLE ONLY public."SpaceAccess"
ADD CONSTRAINT "SpaceAccess_space_id_fkey" FOREIGN KEY (
space_id
) REFERENCES public."Space" (
) REFERENCES public."Space"(
id
) ON UPDATE CASCADE ON DELETE CASCADE;

Expand All @@ -149,12 +149,12 @@ COMMENT ON COLUMN public.group_membership.group_id IS 'The group identifier';
ALTER TABLE ONLY public.group_membership
ADD CONSTRAINT "group_membership_member_id_fkey" FOREIGN KEY (
member_id
) REFERENCES auth.users (id) ON UPDATE CASCADE ON DELETE CASCADE;
) REFERENCES auth.users(id) ON UPDATE CASCADE ON DELETE CASCADE;

ALTER TABLE ONLY public.group_membership
ADD CONSTRAINT "group_membership_group_id_fkey" FOREIGN KEY (
group_id
) REFERENCES auth.users (id) ON UPDATE CASCADE ON DELETE CASCADE;
) REFERENCES auth.users(id) ON UPDATE CASCADE ON DELETE CASCADE;

CREATE OR REPLACE VIEW public.my_groups AS
SELECT id, split_part(email, '@', 1) AS name FROM auth.users
Expand Down Expand Up @@ -235,7 +235,7 @@ AS $$
WHERE member_id = auth.uid() AND group_id = group_id_ AND admin);
$$;

CREATE OR REPLACE FUNCTION public.my_space_ids(access_level public."SpaceAccessPermissions" = 'reader') RETURNS BIGINT []
CREATE OR REPLACE FUNCTION public.my_space_ids(access_level public."SpaceAccessPermissions" = 'reader') RETURNS BIGINT[]
STABLE SECURITY DEFINER
SET search_path = ''
LANGUAGE sql
Expand Down Expand Up @@ -365,11 +365,11 @@ ALTER TABLE public."Space" ENABLE ROW LEVEL SECURITY;

DROP POLICY IF EXISTS space_policy ON public."Space";
DROP POLICY IF EXISTS space_select_policy ON public."Space";
CREATE POLICY space_select_policy ON public."Space" FOR SELECT USING (id = any((SELECT public.my_space_ids('partial'))::bigint []));
CREATE POLICY space_select_policy ON public."Space" FOR SELECT USING (id = any((SELECT public.my_space_ids('partial'))::bigint[]));
DROP POLICY IF EXISTS space_delete_policy ON public."Space";
CREATE POLICY space_delete_policy ON public."Space" FOR DELETE USING (id = any((SELECT public.my_space_ids('editor'))::bigint []));
CREATE POLICY space_delete_policy ON public."Space" FOR DELETE USING (id = any((SELECT public.my_space_ids('editor'))::bigint[]));
DROP POLICY IF EXISTS space_update_policy ON public."Space";
CREATE POLICY space_update_policy ON public."Space" FOR UPDATE USING (id = any((SELECT public.my_space_ids('editor'))::bigint []));
CREATE POLICY space_update_policy ON public."Space" FOR UPDATE USING (id = any((SELECT public.my_space_ids('editor'))::bigint[]));
-- No insert policy: clients cannot insert into Space. See space.sql.
DROP POLICY IF EXISTS space_insert_policy ON public."Space";

Expand Down Expand Up @@ -409,7 +409,7 @@ WHERE id IN (
JOIN public.my_user_accounts() ON (account_uid = my_user_accounts)
WHERE permissions >= 'partial'
UNION
SELECT id FROM public."PlatformAccount" WHERE dg_account = auth.uid()
SELECT pa.id FROM public."PlatformAccount" AS pa WHERE pa.dg_account = auth.uid()
);

-- Single-table views are writable, and writes run as the view owner, bypassing PlatformAccount's RLS.
Expand Down Expand Up @@ -503,24 +503,24 @@ ALTER TABLE public."SpaceAccess" ENABLE ROW LEVEL SECURITY;
DROP POLICY IF EXISTS space_access_policy ON public."SpaceAccess";

DROP POLICY IF EXISTS space_access_select_policy ON public."SpaceAccess";
CREATE POLICY space_access_select_policy ON public."SpaceAccess" FOR SELECT USING (space_id = any((SELECT public.my_space_ids('reader'))::bigint []));
CREATE POLICY space_access_select_policy ON public."SpaceAccess" FOR SELECT USING (space_id = any((SELECT public.my_space_ids('reader'))::bigint[]));

DROP POLICY IF EXISTS space_access_delete_policy ON public."SpaceAccess";
CREATE POLICY space_access_delete_policy ON public."SpaceAccess" FOR DELETE USING (space_id = any((SELECT public.my_space_ids('editor'))::bigint []));
CREATE POLICY space_access_delete_policy ON public."SpaceAccess" FOR DELETE USING (space_id = any((SELECT public.my_space_ids('editor'))::bigint[]));

DROP POLICY IF EXISTS space_access_insert_policy ON public."SpaceAccess";
CREATE POLICY space_access_insert_policy ON public."SpaceAccess" FOR INSERT WITH CHECK (space_id = any((SELECT public.my_space_ids('editor'))::bigint []));
CREATE POLICY space_access_insert_policy ON public."SpaceAccess" FOR INSERT WITH CHECK (space_id = any((SELECT public.my_space_ids('editor'))::bigint[]));

DROP POLICY IF EXISTS space_access_update_policy ON public."SpaceAccess";
CREATE POLICY space_access_update_policy ON public."SpaceAccess" FOR UPDATE USING (space_id = any((SELECT public.my_space_ids('editor'))::bigint []));
CREATE POLICY space_access_update_policy ON public."SpaceAccess" FOR UPDATE USING (space_id = any((SELECT public.my_space_ids('editor'))::bigint[]));

ALTER TABLE public."LocalAccess" ENABLE ROW LEVEL SECURITY;

DROP POLICY IF EXISTS local_access_policy ON public."LocalAccess";

-- The AgentIdentifier select policy and the PlatformAccount write policies read LocalAccess as the caller, so narrowing this policy narrows them too, with no error.
DROP POLICY IF EXISTS local_access_select_policy ON public."LocalAccess";
CREATE POLICY local_access_select_policy ON public."LocalAccess" FOR SELECT USING (space_id = any((SELECT public.my_space_ids('reader'))::bigint []));
CREATE POLICY local_access_select_policy ON public."LocalAccess" FOR SELECT USING (space_id = any((SELECT public.my_space_ids('reader'))::bigint[]));

DROP POLICY IF EXISTS local_access_delete_policy ON public."LocalAccess";
CREATE POLICY local_access_delete_policy ON public."LocalAccess" FOR DELETE USING (space_id = any((SELECT public.my_space_ids('editor'))::bigint[]) AND (account_id IN (SELECT account_id FROM public.account_ids_in_shared_spaces('editor') WHERE unowned) OR account_id IN (SELECT public.my_platform_account_ids())));
Expand Down
18 changes: 9 additions & 9 deletions packages/database/supabase/schemas/assets.sql
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ SELECT
source_path
FROM public."FileReference"
WHERE
space_id = any((SELECT public.my_space_ids('reader'))::bigint [])
space_id = any((SELECT public.my_space_ids('reader'))::bigint[])
OR (
space_id = any((SELECT public.my_space_ids('partial'))::bigint [])
space_id = any((SELECT public.my_space_ids('partial'))::bigint[])
AND (space_id, source_local_id) IN (SELECT space_id, source_local_id FROM public.my_accessible_resources())
);

Expand All @@ -53,18 +53,18 @@ ALTER TABLE public."FileReference" ENABLE ROW LEVEL SECURITY;
DROP POLICY IF EXISTS file_reference_policy ON public."FileReference";
DROP POLICY IF EXISTS file_reference_select_policy ON public."FileReference";
CREATE POLICY file_reference_select_policy ON public."FileReference" FOR SELECT USING (
space_id = any((SELECT public.my_space_ids('reader'))::bigint [])
space_id = any((SELECT public.my_space_ids('reader'))::bigint[])
OR (
space_id = any((SELECT public.my_space_ids('partial'))::bigint [])
space_id = any((SELECT public.my_space_ids('partial'))::bigint[])
AND EXISTS (SELECT 1 FROM public.my_resource_grants AS r WHERE r.space_id = "FileReference".space_id AND r.source_local_id = "FileReference".source_local_id)
)
);
DROP POLICY IF EXISTS file_reference_delete_policy ON public."FileReference";
CREATE POLICY file_reference_delete_policy ON public."FileReference" FOR DELETE USING (space_id = any((SELECT public.my_space_ids('editor'))::bigint []));
CREATE POLICY file_reference_delete_policy ON public."FileReference" FOR DELETE USING (space_id = any((SELECT public.my_space_ids('editor'))::bigint[]));
DROP POLICY IF EXISTS file_reference_insert_policy ON public."FileReference";
CREATE POLICY file_reference_insert_policy ON public."FileReference" FOR INSERT WITH CHECK (space_id = any((SELECT public.my_space_ids('editor'))::bigint []));
CREATE POLICY file_reference_insert_policy ON public."FileReference" FOR INSERT WITH CHECK (space_id = any((SELECT public.my_space_ids('editor'))::bigint[]));
DROP POLICY IF EXISTS file_reference_update_policy ON public."FileReference";
CREATE POLICY file_reference_update_policy ON public."FileReference" FOR UPDATE USING (space_id = any((SELECT public.my_space_ids('editor'))::bigint []));
CREATE POLICY file_reference_update_policy ON public."FileReference" FOR UPDATE USING (space_id = any((SELECT public.my_space_ids('editor'))::bigint[]));

-- We cannot delete blobs from sql; we'll need to call an edge function with pg_net.
-- We could pass the name to the edge function, but it's safer to accumulate paths in a table
Expand Down Expand Up @@ -146,7 +146,7 @@ CREATE TRIGGER on_insert_file_reference_trigger AFTER INSERT ON public."FileRefe
INSERT INTO storage.buckets
(id, name, public)
VALUES
('assets', 'assets', FALSE)
('assets', 'assets', false)
ON CONFLICT (id) DO NOTHING;

DROP POLICY IF EXISTS "storage_insert_assets_authenticated" ON storage.objects;
Expand All @@ -165,7 +165,7 @@ DROP POLICY IF EXISTS "storage_delete_assets_noref" ON storage.objects;
CREATE POLICY "storage_delete_assets_noref"
ON storage.objects FOR DELETE TO authenticated USING (
bucket_id = 'assets' AND NOT EXISTS (
SELECT TRUE FROM public."FileReference"
SELECT true FROM public."FileReference"
WHERE filehash = name LIMIT 1
)
);
Expand Down
36 changes: 18 additions & 18 deletions packages/database/supabase/schemas/concept.sql
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ CREATE TYPE public."EpistemicStatus" AS ENUM (
ALTER TYPE public."EpistemicStatus" OWNER TO postgres;

CREATE OR REPLACE FUNCTION public.extract_references(refs JSONB)
RETURNS BIGINT [] IMMUTABLE
RETURNS BIGINT[] IMMUTABLE
SET search_path = ''
LANGUAGE sql
AS $$
Expand All @@ -36,7 +36,7 @@ CREATE TABLE IF NOT EXISTS public."Concept" (
schema_id bigint,
literal_content jsonb NOT NULL DEFAULT '{}'::jsonb,
reference_content jsonb NOT NULL DEFAULT '{}'::jsonb,
refs BIGINT [] NOT NULL GENERATED ALWAYS AS (extract_references(reference_content)) STORED,
refs BIGINT[] NOT NULL GENERATED ALWAYS AS (extract_references(reference_content)) STORED,
is_schema boolean DEFAULT false NOT NULL,
source_local_id character varying
);
Expand Down Expand Up @@ -77,17 +77,17 @@ CREATE UNIQUE INDEX concept_space_and_name_idx ON public."Concept" (space_id, na
ALTER TABLE ONLY public."Concept"
ADD CONSTRAINT "Concept_author_id_fkey" FOREIGN KEY (
author_id
) REFERENCES public."PlatformAccount" (id) ON UPDATE CASCADE ON DELETE SET NULL;
) REFERENCES public."PlatformAccount"(id) ON UPDATE CASCADE ON DELETE SET NULL;

ALTER TABLE ONLY public."Concept"
ADD CONSTRAINT "Concept_schema_id_fkey" FOREIGN KEY (
schema_id
) REFERENCES public."Concept" (id) ON UPDATE CASCADE ON DELETE SET NULL;
) REFERENCES public."Concept"(id) ON UPDATE CASCADE ON DELETE SET NULL;

ALTER TABLE ONLY public."Concept"
ADD CONSTRAINT "Concept_space_id_fkey" FOREIGN KEY (
space_id
) REFERENCES public."Space" (
) REFERENCES public."Space"(
id
) ON UPDATE CASCADE ON DELETE CASCADE;

Expand Down Expand Up @@ -139,8 +139,8 @@ IS 'Maintains the derived arity and is_relation columns; values supplied by the
REVOKE ALL ON FUNCTION public.concept_set_derived_columns FROM authenticated;

CREATE TRIGGER concept_set_derived_columns_trigger
BEFORE INSERT OR UPDATE ON public."Concept"
FOR EACH ROW EXECUTE FUNCTION public.concept_set_derived_columns();
BEFORE INSERT OR UPDATE ON public."Concept"
FOR EACH ROW EXECUTE FUNCTION public.concept_set_derived_columns();

CREATE OR REPLACE FUNCTION public.concept_propagate_derived_columns() RETURNS TRIGGER
SET search_path = ''
Expand Down Expand Up @@ -168,9 +168,9 @@ REVOKE ALL ON FUNCTION public.concept_propagate_derived_columns FROM authenticat

-- The WHEN clause also stops the recursion: the propagated UPDATE does not touch literal_content.
CREATE TRIGGER concept_propagate_derived_columns_trigger
AFTER UPDATE ON public."Concept"
FOR EACH ROW WHEN (NEW.is_schema AND OLD.literal_content IS DISTINCT FROM NEW.literal_content)
EXECUTE FUNCTION public.concept_propagate_derived_columns();
AFTER UPDATE ON public."Concept"
FOR EACH ROW WHEN (new.is_schema AND old.literal_content IS DISTINCT FROM new.literal_content)
EXECUTE FUNCTION public.concept_propagate_derived_columns();

-- Single SELECT from Concept: PostgREST cannot infer foreign keys through a UNION.
-- (SELECT ...) runs each space lookup once per query, not per row; ::bigint [] keeps = any() an array comparison.
Expand All @@ -194,9 +194,9 @@ SELECT
is_relation
FROM public."Concept"
WHERE
space_id = any((SELECT public.my_space_ids('reader'))::bigint [])
space_id = any((SELECT public.my_space_ids('reader'))::bigint[])
OR (
space_id = any((SELECT public.my_space_ids('partial'))::bigint [])
space_id = any((SELECT public.my_space_ids('partial'))::bigint[])
AND (space_id, source_local_id) IN (SELECT space_id, source_local_id FROM public.my_accessible_resources())
);

Expand Down Expand Up @@ -379,7 +379,7 @@ CREATE TYPE public.concept_local_input AS (
creator_local_id VARCHAR,
document_local_id VARCHAR,
-- inline values
contents_inline public.content_local_input [],
contents_inline public.content_local_input[],
document_inline public.document_local_input,
author_inline public.account_local_input,
creator_inline public.account_local_input
Expand Down Expand Up @@ -606,18 +606,18 @@ ALTER TABLE public."Concept" ENABLE ROW LEVEL SECURITY;
DROP POLICY IF EXISTS concept_policy ON public."Concept";
DROP POLICY IF EXISTS concept_select_policy ON public."Concept";
CREATE POLICY concept_select_policy ON public."Concept" FOR SELECT USING (
space_id = any((SELECT public.my_space_ids('reader'))::bigint [])
space_id = any((SELECT public.my_space_ids('reader'))::bigint[])
OR (
space_id = any((SELECT public.my_space_ids('partial'))::bigint [])
space_id = any((SELECT public.my_space_ids('partial'))::bigint[])
AND EXISTS (SELECT 1 FROM public.my_resource_grants AS r WHERE r.space_id = "Concept".space_id AND r.source_local_id = "Concept".source_local_id)
)
);
DROP POLICY IF EXISTS concept_delete_policy ON public."Concept";
CREATE POLICY concept_delete_policy ON public."Concept" FOR DELETE USING (space_id = any((SELECT public.my_space_ids('editor'))::bigint []));
CREATE POLICY concept_delete_policy ON public."Concept" FOR DELETE USING (space_id = any((SELECT public.my_space_ids('editor'))::bigint[]));
DROP POLICY IF EXISTS concept_insert_policy ON public."Concept";
CREATE POLICY concept_insert_policy ON public."Concept" FOR INSERT WITH CHECK (space_id = any((SELECT public.my_space_ids('editor'))::bigint []));
CREATE POLICY concept_insert_policy ON public."Concept" FOR INSERT WITH CHECK (space_id = any((SELECT public.my_space_ids('editor'))::bigint[]));
DROP POLICY IF EXISTS concept_update_policy ON public."Concept";
CREATE POLICY concept_update_policy ON public."Concept" FOR UPDATE USING (space_id = any((SELECT public.my_space_ids('editor'))::bigint []));
CREATE POLICY concept_update_policy ON public."Concept" FOR UPDATE USING (space_id = any((SELECT public.my_space_ids('editor'))::bigint[]));

-- since ResourceAccess is used for both Content and Concepts,
-- we cannot count on the usual foreign key delete cascades.
Expand Down
Loading
Loading