Skip to content

Commit 96feaa6

Browse files
authored
Fix ci schema validation (#40)
* Fix ci schema validation * Dump schema
1 parent 3b6a3c8 commit 96feaa6

2 files changed

Lines changed: 16 additions & 14 deletions

File tree

.github/workflows/schema-validation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
- name: Validate schema is in sync with migrations
4545
run: |
4646
# Apply migrations
47-
dbmate up
47+
DBMATE_SCHEMA_FILE=ci-dump.sql dbmate up
4848
4949
# Force dump in case problems were ignored
5050
DBMATE_SCHEMA_FILE=ci-dump.sql dbmate dump

database.sql

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
\restrict ofpmBZgaMbuYf558teg7MYcyPbiwJkZyYgREoiBTduRUlCZa72Go911eC5LHqgI
1+
\restrict AsCPTOt3U9KhJ9fUdZGWUtrBsH1prEN0qQZE48Juv4M8WNoa7mPKZojrPqmzFhv
22

33
-- Dumped from database version 16.11 (Ubuntu 16.11-1.pgdg24.04+1)
44
-- Dumped by pg_dump version 16.11 (Ubuntu 16.11-1.pgdg24.04+1)
@@ -602,40 +602,41 @@ $$;
602602

603603

604604
--
605-
-- Name: validate_transformation_key_offset(jsonb); Type: FUNCTION; Schema: public; Owner: -
605+
-- Name: validate_transformation_key_length(jsonb); Type: FUNCTION; Schema: public; Owner: -
606606
--
607607

608-
CREATE FUNCTION public.validate_transformation_key_offset(object jsonb) RETURNS boolean
608+
CREATE FUNCTION public.validate_transformation_key_length(object jsonb) RETURNS boolean
609609
LANGUAGE plpgsql
610610
AS $$
611611
BEGIN
612-
RETURN object ? 'offset' AND is_jsonb_number(object -> 'offset') AND (object ->> 'offset')::integer >= 0;
612+
RETURN object ? 'length' AND is_jsonb_number(object -> 'length') AND (object ->> 'length')::integer > 0;
613613
END;
614614
$$;
615615

616616

617617
--
618-
-- Name: validate_transformation_key_length(jsonb); Type: FUNCTION; Schema: public; Owner: -
618+
-- Name: validate_transformation_key_length_optional(jsonb); Type: FUNCTION; Schema: public; Owner: -
619619
--
620620

621-
CREATE FUNCTION public.validate_transformation_key_length(object jsonb) RETURNS boolean
621+
CREATE FUNCTION public.validate_transformation_key_length_optional(object jsonb) RETURNS boolean
622622
LANGUAGE plpgsql
623623
AS $$
624624
BEGIN
625-
RETURN object ? 'length' AND is_jsonb_number(object -> 'length') AND (object ->> 'length')::integer > 0;
625+
RETURN NOT object ? 'length'
626+
OR (is_jsonb_number(object -> 'length') AND (object ->> 'length')::integer > 0);
626627
END;
627628
$$;
628629

630+
629631
--
630-
-- Name: validate_transformation_key_length_optional(jsonb); Type: FUNCTION; Schema: public; Owner: -
632+
-- Name: validate_transformation_key_offset(jsonb); Type: FUNCTION; Schema: public; Owner: -
631633
--
632634

633-
CREATE FUNCTION public.validate_transformation_key_length_optional(object jsonb) RETURNS boolean
635+
CREATE FUNCTION public.validate_transformation_key_offset(object jsonb) RETURNS boolean
634636
LANGUAGE plpgsql
635637
AS $$
636638
BEGIN
637-
RETURN NOT object ? 'length'
638-
OR (is_jsonb_number(object -> 'length') AND (object ->> 'length')::integer > 0);
639+
RETURN object ? 'offset' AND is_jsonb_number(object -> 'offset') AND (object ->> 'offset')::integer >= 0;
639640
END;
640641
$$;
641642

@@ -1730,7 +1731,7 @@ ALTER TABLE ONLY public.verified_contracts
17301731
-- PostgreSQL database dump complete
17311732
--
17321733

1733-
\unrestrict ofpmBZgaMbuYf558teg7MYcyPbiwJkZyYgREoiBTduRUlCZa72Go911eC5LHqgI
1734+
\unrestrict AsCPTOt3U9KhJ9fUdZGWUtrBsH1prEN0qQZE48Juv4M8WNoa7mPKZojrPqmzFhv
17341735

17351736

17361737
--
@@ -1741,4 +1742,5 @@ INSERT INTO public.schema_migrations (version) VALUES
17411742
('20250717103432'),
17421743
('20250723145429'),
17431744
('20251023134207'),
1744-
('20251106144315');
1745+
('20251106144315'),
1746+
('20260126113330');

0 commit comments

Comments
 (0)