diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d8e672d12..7e8bcf3d4 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -9,7 +9,7 @@ repos: # Lint / autoformat: Python code - repo: https://github.com/astral-sh/ruff-pre-commit # Ruff version. - rev: "v0.6.5" + rev: "v0.6.7" hooks: # Run the linter - id: ruff @@ -71,7 +71,7 @@ repos: # Lint & Autoformat: SQL - repo: https://github.com/sqlfluff/sqlfluff - rev: 3.1.1 + rev: 3.2.0 hooks: - id: sqlfluff-lint files: ^src/backend/migrations/(?:.*/)*.*$ diff --git a/src/backend/migrations/archived/2024-02-24/003-project-roles.sql b/src/backend/migrations/archived/2024-02-24/003-project-roles.sql index 75313f553..213bb0712 100644 --- a/src/backend/migrations/archived/2024-02-24/003-project-roles.sql +++ b/src/backend/migrations/archived/2024-02-24/003-project-roles.sql @@ -21,10 +21,10 @@ END $$; ALTER TYPE public.projectrole OWNER TO fmtm; ALTER TABLE public.user_roles -ALTER COLUMN "role" TYPE VARCHAR(24); +ALTER COLUMN role TYPE VARCHAR(24); ALTER TABLE public.user_roles -ALTER COLUMN "role" TYPE public.projectrole USING role::public.projectrole; +ALTER COLUMN role TYPE public.projectrole USING role::public.projectrole; -- Commit the transaction COMMIT; diff --git a/src/backend/migrations/archived/2024-02-24/revert/003-project-roles.sql b/src/backend/migrations/archived/2024-02-24/revert/003-project-roles.sql index 72e6ad5d8..930bc17db 100644 --- a/src/backend/migrations/archived/2024-02-24/revert/003-project-roles.sql +++ b/src/backend/migrations/archived/2024-02-24/revert/003-project-roles.sql @@ -2,9 +2,9 @@ BEGIN; -- Revert user_roles table changes -ALTER TABLE public.user_roles ALTER COLUMN "role" TYPE VARCHAR(24); +ALTER TABLE public.user_roles ALTER COLUMN role TYPE VARCHAR(24); -ALTER TABLE public.user_roles ALTER COLUMN "role" TYPE public.userrole +ALTER TABLE public.user_roles ALTER COLUMN role TYPE public.userrole USING role::public.userrole; -- Drop the public.projectrole enum diff --git a/src/backend/migrations/init/fmtm_base_schema.sql b/src/backend/migrations/init/fmtm_base_schema.sql index c556d1f5b..17f20b4d3 100644 --- a/src/backend/migrations/init/fmtm_base_schema.sql +++ b/src/backend/migrations/init/fmtm_base_schema.sql @@ -155,11 +155,11 @@ SET default_table_access_method = heap; -- Tables -CREATE TABLE IF NOT EXISTS public."_migrations" ( +CREATE TABLE IF NOT EXISTS public._migrations ( date_executed TIMESTAMP, script_name TEXT ); -ALTER TABLE public."_migrations" OWNER TO fmtm; +ALTER TABLE public._migrations OWNER TO fmtm; CREATE TABLE public.background_tasks ( @@ -193,11 +193,11 @@ ALTER TABLE public.mbtiles_path_id_seq OWNER TO fmtm; ALTER SEQUENCE public.mbtiles_path_id_seq OWNED BY public.mbtiles_path.id; -CREATE TABLE public."_migrations" ( +CREATE TABLE public._migrations ( script_name text, date_executed timestamp without time zone ); -ALTER TABLE public."_migrations" OWNER TO fmtm; +ALTER TABLE public._migrations OWNER TO fmtm; CREATE TABLE public.organisation_managers ( @@ -436,8 +436,8 @@ ALTER TABLE ONLY public.submission_photos ALTER COLUMN id SET DEFAULT nextval( -- Constraints for primary keys -ALTER TABLE public."_migrations" -ADD CONSTRAINT "_migrations_pkey" PRIMARY KEY (script_name); +ALTER TABLE public._migrations +ADD CONSTRAINT _migrations_pkey PRIMARY KEY (script_name); ALTER TABLE ONLY public.background_tasks ADD CONSTRAINT background_tasks_pkey PRIMARY KEY (id);