Skip to content

Commit e3a90d7

Browse files
authored
Merge pull request #715 from constructive-io/refactor/merge-main-with-develop-v5
merge develop-v5 and fix tests
2 parents 4f1db1a + ec23bf1 commit e3a90d7

677 files changed

Lines changed: 69794 additions & 214519 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/run-tests.yaml

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -73,28 +73,9 @@ jobs:
7373
env: {}
7474
- package: graphile/graphile-search-plugin
7575
env: {}
76-
- package: graphile/graphile-plugin-fulltext-filter
76+
- package: graphile/graphile-authz
7777
env: {}
78-
- package: graphile/graphile-simple-inflector
79-
env: {}
80-
- package: graphile/graphile-many-to-many
81-
env: {}
82-
- package: graphile/graphile-i18n
83-
env: {}
84-
- package: graphile/graphile-meta-schema
85-
env: {}
86-
- package: graphile/graphile-upload-plugin
87-
env:
88-
BUCKET_NAME: test-upload-bucket
89-
- package: graphile/graphile-postgis
90-
env: {}
91-
- package: graphile/graphile-plugin-connection-filter
92-
env: {}
93-
- package: graphile/graphile-plugin-connection-filter-postgis
94-
env: {}
95-
- package: graphile/graphile-pg-type-mappings
96-
env: {}
97-
- package: graphile/graphile-sql-expression-validator
78+
- package: graphile/postgraphile-plugin-pgvector
9879
env: {}
9980
- package: graphql/server-test
10081
env: {}
@@ -179,14 +160,14 @@ jobs:
179160
- name: Setup Node.js
180161
uses: actions/setup-node@v4
181162
with:
182-
node-version: '20'
163+
node-version: '22'
183164

184165
- name: Setup pnpm
185166
uses: pnpm/action-setup@v2
186167
with:
187168
version: 10
188169

189-
- name: build
170+
- name: install
190171
run: pnpm install
191172

192173
- name: build

__fixtures__/sqitch/simple-w-exts/extensions/@pgpm/types/deploy/schemas/public/domains/attachment.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
-- requires: schemas/public/schema
33

44
BEGIN;
5-
CREATE DOMAIN attachment AS text CHECK (VALUE ~ '^(https?)://[^\s/$.?#].[^\s]*$');
6-
COMMENT ON DOMAIN attachment IS E'@name pgpmInternalTypeAttachment';
5+
CREATE DOMAIN attachment AS text;
6+
COMMENT ON DOMAIN attachment IS E'@name constructiveInternalTypeAttachment';
77
COMMIT;

__fixtures__/sqitch/simple-w-exts/extensions/@pgpm/types/deploy/schemas/public/domains/email.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
-- requires: schemas/public/schema
33

44
BEGIN;
5-
CREATE DOMAIN email AS citext CHECK (value ~ '^[a-zA-Z0-9.!#$%&''*+/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$');
6-
COMMENT ON DOMAIN email IS E'@name pgpmInternalTypeEmail';
5+
CREATE DOMAIN email AS citext;
6+
COMMENT ON DOMAIN email IS E'@name constructiveInternalTypeEmail';
77
COMMIT;
88

__fixtures__/sqitch/simple-w-exts/extensions/@pgpm/types/deploy/schemas/public/domains/hostname.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
-- requires: schemas/public/schema
33

44
BEGIN;
5-
CREATE DOMAIN hostname AS text CHECK (VALUE ~ '^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])$');
6-
COMMENT ON DOMAIN hostname IS E'@name pgpmInternalTypeHostname';
5+
CREATE DOMAIN hostname AS text;
6+
COMMENT ON DOMAIN hostname IS E'@name constructiveInternalTypeHostname';
77
COMMIT;
88

__fixtures__/sqitch/simple-w-exts/extensions/@pgpm/types/deploy/schemas/public/domains/image.sql

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22
-- requires: schemas/public/schema
33

44
BEGIN;
5-
CREATE DOMAIN image AS jsonb CHECK (
6-
value ?& ARRAY['url', 'mime']
7-
AND
8-
value->>'url' ~ '^(https?)://[^\s/$.?#].[^\s]*$'
9-
);
10-
COMMENT ON DOMAIN image IS E'@name pgpmInternalTypeImage';
5+
CREATE DOMAIN image AS jsonb CHECK (value ? 'url');
6+
COMMENT ON DOMAIN image IS E'@name constructiveInternalTypeImage';
117
COMMIT;
128

__fixtures__/sqitch/simple-w-exts/extensions/@pgpm/types/deploy/schemas/public/domains/multiple_select.sql

Lines changed: 0 additions & 8 deletions
This file was deleted.

__fixtures__/sqitch/simple-w-exts/extensions/@pgpm/types/deploy/schemas/public/domains/origin.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
-- requires: schemas/public/schema
33

44
BEGIN;
5-
CREATE DOMAIN origin AS text CHECK (VALUE = substring(VALUE from '^(https?://[^/]*)'));
6-
COMMENT ON DOMAIN origin IS E'@name pgpmInternalTypeOrigin';
5+
CREATE DOMAIN origin AS text CHECK (value ~ '^https?://[^\s]+$');
6+
COMMENT ON DOMAIN origin IS E'@name constructiveInternalTypeOrigin';
77
COMMIT;
88

__fixtures__/sqitch/simple-w-exts/extensions/@pgpm/types/deploy/schemas/public/domains/single_select.sql

Lines changed: 0 additions & 12 deletions
This file was deleted.
Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
11
-- Deploy schemas/public/domains/upload to pg
2-
32
-- requires: schemas/public/schema
43

54
BEGIN;
6-
7-
CREATE DOMAIN upload AS jsonb CHECK (
8-
value ?& ARRAY['url', 'mime']
9-
AND
10-
value->>'url' ~ '^(https?)://[^\s/$.?#].[^\s]*$'
11-
);
12-
COMMENT ON DOMAIN upload IS E'@name pgpmInternalTypeUpload';
13-
5+
CREATE DOMAIN upload AS jsonb CHECK (value ? 'url' OR value ? 'id' OR value ? 'key');
6+
COMMENT ON DOMAIN upload IS E'@name constructiveInternalTypeUpload';
147
COMMIT;

__fixtures__/sqitch/simple-w-exts/extensions/@pgpm/types/deploy/schemas/public/domains/url.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
-- requires: schemas/public/schema
33

44
BEGIN;
5-
CREATE DOMAIN url AS text CHECK (VALUE ~ '^(https?)://[^\s/$.?#].[^\s]*$');
6-
COMMENT ON DOMAIN url IS E'@name pgpmInternalTypeUrl';
5+
CREATE DOMAIN url AS text CHECK (value ~ '^https?://[^\s]+$');
6+
COMMENT ON DOMAIN url IS E'@name constructiveInternalTypeUrl';
77
COMMIT;
88

0 commit comments

Comments
 (0)