@pgpm/types 0.16.0 → 0.16.8

package/Makefile

@@ -1,5 +1,5 @@
 EXTENSION = pgpm-types
-DATA = sql/pgpm-types--0.15.3.sql
+DATA = sql/pgpm-types--0.16.0.sql
 
 PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)

package/deploy/schemas/public/domains/attachment.sql

@@ -2,6 +2,6 @@
 -- requires: schemas/public/schema
 
 BEGIN;
-CREATE DOMAIN attachment AS text CHECK (VALUE ~ '^(https?)://[^\s/$.?#].[^\s]*$');
-COMMENT ON DOMAIN attachment IS E'@name pgpmInternalTypeAttachment';
+CREATE DOMAIN attachment AS text CHECK (value ~ '^https?://[^\s]+$');
+COMMENT ON DOMAIN attachment IS E'@name constructiveInternalTypeAttachment';
 COMMIT;

package/deploy/schemas/public/domains/email.sql

@@ -2,7 +2,7 @@
 -- requires: schemas/public/schema
 
 BEGIN;
-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])?)*$');
-COMMENT ON DOMAIN email IS E'@name pgpmInternalTypeEmail';
+CREATE DOMAIN email AS citext CHECK (value ~ '@');
+COMMENT ON DOMAIN email IS E'@name constructiveInternalTypeEmail';
 COMMIT;
 

package/deploy/schemas/public/domains/hostname.sql

@@ -2,7 +2,7 @@
 -- requires: schemas/public/schema
 
 BEGIN;
-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])$');
-COMMENT ON DOMAIN hostname IS E'@name pgpmInternalTypeHostname';
+CREATE DOMAIN hostname AS text CHECK (value ~ '^[^\s]+$');
+COMMENT ON DOMAIN hostname IS E'@name constructiveInternalTypeHostname';
 COMMIT;
 

package/deploy/schemas/public/domains/image.sql

@@ -3,10 +3,16 @@
 
 BEGIN;
 CREATE DOMAIN image AS jsonb CHECK (
-  value ?& ARRAY['url', 'mime']
-  AND
-  value->>'url' ~ '^(https?)://[^\s/$.?#].[^\s]*$'
+  jsonb_typeof(value) = 'object'
+  AND (value ? 'url' OR value ? 'id' OR value ? 'key')
+  AND (NOT value ? 'url' OR (value->>'url') ~ '^https?://[^\s]+$')
+  AND (NOT value ? 'id' OR jsonb_typeof(value->'id') = 'string')
+  AND (NOT value ? 'key' OR jsonb_typeof(value->'key') = 'string')
+  AND (NOT value ? 'bucket' OR jsonb_typeof(value->'bucket') = 'string')
+  AND (NOT value ? 'provider' OR jsonb_typeof(value->'provider') = 'string')
+  AND (NOT value ? 'mime' OR jsonb_typeof(value->'mime') = 'string')
+  AND (NOT value ? 'versions' OR jsonb_typeof(value->'versions') = 'array')
 );
-COMMENT ON DOMAIN image IS E'@name pgpmInternalTypeImage';
+COMMENT ON DOMAIN image IS E'@name constructiveInternalTypeImage';
 COMMIT;
 

package/deploy/schemas/public/domains/origin.sql

@@ -2,7 +2,7 @@
 -- requires: schemas/public/schema
 
 BEGIN;
-CREATE DOMAIN origin AS text CHECK (VALUE = substring(VALUE from '^(https?://[^/]*)'));
-COMMENT ON DOMAIN origin IS E'@name pgpmInternalTypeOrigin';
+CREATE DOMAIN origin AS text CHECK (value ~ '^https?://[^/\s]+$');
+COMMENT ON DOMAIN origin IS E'@name constructiveInternalTypeOrigin';
 COMMIT;
 

package/deploy/schemas/public/domains/upload.sql

@@ -1,14 +1,16 @@
 -- Deploy schemas/public/domains/upload to pg
-
 -- requires: schemas/public/schema
 
 BEGIN;
-
 CREATE DOMAIN upload AS jsonb CHECK (
-  value ?& ARRAY['url', 'mime']
-  AND
-  value->>'url' ~ '^(https?)://[^\s/$.?#].[^\s]*$'
+  jsonb_typeof(value) = 'object'
+  AND (value ? 'url' OR value ? 'id' OR value ? 'key')
+  AND (NOT value ? 'url' OR (value->>'url') ~ '^https?://[^\s]+$')
+  AND (NOT value ? 'id' OR jsonb_typeof(value->'id') = 'string')
+  AND (NOT value ? 'key' OR jsonb_typeof(value->'key') = 'string')
+  AND (NOT value ? 'bucket' OR jsonb_typeof(value->'bucket') = 'string')
+  AND (NOT value ? 'provider' OR jsonb_typeof(value->'provider') = 'string')
+  AND (NOT value ? 'mime' OR jsonb_typeof(value->'mime') = 'string')
 );
-COMMENT ON DOMAIN upload IS E'@name pgpmInternalTypeUpload';
-
+COMMENT ON DOMAIN upload IS E'@name constructiveInternalTypeUpload';
 COMMIT;

package/deploy/schemas/public/domains/url.sql

@@ -2,7 +2,7 @@
 -- requires: schemas/public/schema
 
 BEGIN;
-CREATE DOMAIN url AS text CHECK (VALUE ~ '^(https?)://[^\s/$.?#].[^\s]*$');
-COMMENT ON DOMAIN url IS E'@name pgpmInternalTypeUrl';
+CREATE DOMAIN url AS text CHECK (value ~ '^https?://[^\s]+$');
+COMMENT ON DOMAIN url IS E'@name constructiveInternalTypeUrl';
 COMMIT;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pgpm/types",
-  "version": "0.16.0",
+  "version": "0.16.8",
   "description": "Core PostgreSQL data types with deploy/verify/revert SQL scripts",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "contributors": [
@@ -34,5 +34,5 @@
   "bugs": {
     "url": "https://github.com/constructive-io/pgpm-modules/issues"
   },
-  "gitHead": "3b2260bf7640d7194f237d556c7e5033bc7a9405"
+  "gitHead": "a0718b6712d797acacfd51fbcdad8a6d577d8bbc"
 }

package/pgpm-types.control

@@ -1,6 +1,6 @@
 # pgpm-types extension
 comment = 'pgpm-types extension'
-default_version = '0.15.3'
+default_version = '0.16.0'
 module_pathname = '$libdir/pgpm-types'
 requires = 'plpgsql,citext,pgpm-verify'
 relocatable = false

package/pgpm.plan

@@ -7,8 +7,6 @@ schemas/public/domains/attachment [schemas/public/schema] 2017-08-11T08:11:51Z s
 schemas/public/domains/email [schemas/public/schema] 2017-08-11T08:11:51Z skitch <skitch@5b0c196eeb62> # add schemas/public/domains/email
 schemas/public/domains/hostname [schemas/public/schema] 2017-08-11T08:11:51Z skitch <skitch@5b0c196eeb62> # add schemas/public/domains/hostname
 schemas/public/domains/image [schemas/public/schema] 2017-08-11T08:11:51Z skitch <skitch@5b0c196eeb62> # add schemas/public/domains/image
-schemas/public/domains/multiple_select [schemas/public/schema] 2017-08-11T08:11:51Z skitch <skitch@5b0c196eeb62> # add schemas/public/domains/multiple_select
 schemas/public/domains/origin [schemas/public/schema] 2017-08-11T08:11:51Z skitch <skitch@5b0c196eeb62> # add schemas/public/domains/origin
-schemas/public/domains/single_select [schemas/public/schema] 2017-08-11T08:11:51Z skitch <skitch@5b0c196eeb62> # add schemas/public/domains/single_select
 schemas/public/domains/upload [schemas/public/schema] 2017-08-11T08:11:51Z skitch <skitch@5b0c196eeb62> # add schemas/public/domains/upload
 schemas/public/domains/url [schemas/public/schema] 2017-08-11T08:11:51Z skitch <skitch@5b0c196eeb62> # add schemas/public/domains/url

package/sql/pgpm-types--0.16.0.sql

@@ -0,0 +1,71 @@
+\echo Use "CREATE EXTENSION pgpm-types" to load this file. \quit
+CREATE DOMAIN attachment AS text 
+  CHECK (value ~ E'^https?://[^\\s]+$');
+
+COMMENT ON DOMAIN attachment IS '@name constructiveInternalTypeAttachment';
+
+CREATE DOMAIN email AS citext 
+  CHECK (value ~ '@');
+
+COMMENT ON DOMAIN email IS '@name constructiveInternalTypeEmail';
+
+CREATE DOMAIN hostname AS text 
+  CHECK (value ~ E'^[^\\s]+$');
+
+COMMENT ON DOMAIN hostname IS '@name constructiveInternalTypeHostname';
+
+CREATE DOMAIN image AS jsonb 
+  CHECK (
+  jsonb_typeof(value) = 'object'
+    AND (value ? 'url'
+    OR value ? 'id'
+    OR value ? 'key')
+    AND (NOT (value ? 'url')
+    OR (value ->> 'url') ~ E'^https?://[^\\s]+$')
+    AND (NOT (value ? 'id')
+    OR jsonb_typeof(value -> 'id') = 'string')
+    AND (NOT (value ? 'key')
+    OR jsonb_typeof(value -> 'key') = 'string')
+    AND (NOT (value ? 'bucket')
+    OR jsonb_typeof(value -> 'bucket') = 'string')
+    AND (NOT (value ? 'provider')
+    OR jsonb_typeof(value -> 'provider') = 'string')
+    AND (NOT (value ? 'mime')
+    OR jsonb_typeof(value -> 'mime') = 'string')
+    AND (NOT (value ? 'versions')
+    OR jsonb_typeof(value -> 'versions') = 'array')
+);
+
+COMMENT ON DOMAIN image IS '@name constructiveInternalTypeImage';
+
+CREATE DOMAIN origin AS text 
+  CHECK (value ~ E'^https?://[^/\\s]+$');
+
+COMMENT ON DOMAIN origin IS '@name constructiveInternalTypeOrigin';
+
+CREATE DOMAIN upload AS jsonb 
+  CHECK (
+  jsonb_typeof(value) = 'object'
+    AND (value ? 'url'
+    OR value ? 'id'
+    OR value ? 'key')
+    AND (NOT (value ? 'url')
+    OR (value ->> 'url') ~ E'^https?://[^\\s]+$')
+    AND (NOT (value ? 'id')
+    OR jsonb_typeof(value -> 'id') = 'string')
+    AND (NOT (value ? 'key')
+    OR jsonb_typeof(value -> 'key') = 'string')
+    AND (NOT (value ? 'bucket')
+    OR jsonb_typeof(value -> 'bucket') = 'string')
+    AND (NOT (value ? 'provider')
+    OR jsonb_typeof(value -> 'provider') = 'string')
+    AND (NOT (value ? 'mime')
+    OR jsonb_typeof(value -> 'mime') = 'string')
+);
+
+COMMENT ON DOMAIN upload IS '@name constructiveInternalTypeUpload';
+
+CREATE DOMAIN url AS text 
+  CHECK (value ~ E'^https?://[^\\s]+$');
+
+COMMENT ON DOMAIN url IS '@name constructiveInternalTypeUrl';

package/deploy/schemas/public/domains/multiple_select.sql

@@ -1,8 +0,0 @@
--- Deploy schemas/public/domains/multiple_select to pg
--- requires: schemas/public/schema
-
-BEGIN;
-CREATE DOMAIN multiple_select AS jsonb CHECK (value ?& ARRAY['value']);
-COMMENT ON DOMAIN multiple_select IS E'@name pgpmInternalTypeMultipleSelect';
-COMMIT;
-

package/deploy/schemas/public/domains/single_select.sql

@@ -1,12 +0,0 @@
--- Deploy schemas/public/domains/single_select to pg
-
--- requires: schemas/public/schema
-
-BEGIN;
-
-CREATE DOMAIN single_select AS jsonb CHECK (
-  value ?& ARRAY['value']
-);
-COMMENT ON DOMAIN single_select IS E'@name pgpmInternalTypeSingleSelect';
-
-COMMIT;

package/revert/schemas/public/domains/multiple_select.sql

@@ -1,7 +0,0 @@
--- Revert schemas/public/domains/multiple_select from pg
-
-BEGIN;
-
-DROP TYPE public.multiple_select;
-
-COMMIT;

package/revert/schemas/public/domains/single_select.sql

@@ -1,7 +0,0 @@
--- Revert schemas/public/domains/single_select from pg
-
-BEGIN;
-
-DROP TYPE public.single_select;
-
-COMMIT;

package/sql/pgpm-types--0.15.3.sql

@@ -1,51 +0,0 @@
-\echo Use "CREATE EXTENSION pgpm-types" to load this file. \quit
-CREATE DOMAIN attachment AS text 
-  CHECK (value ~ E'^(https?)://[^\\s/$.?#].[^\\s]*$');
-
-COMMENT ON DOMAIN attachment IS '@name pgpmInternalTypeAttachment';
-
-CREATE DOMAIN email AS citext 
-  CHECK (value ~ E'^[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])?)*$');
-
-COMMENT ON DOMAIN email IS '@name pgpmInternalTypeEmail';
-
-CREATE DOMAIN hostname AS text 
-  CHECK (value ~ E'^(([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])$');
-
-COMMENT ON DOMAIN hostname IS '@name pgpmInternalTypeHostname';
-
-CREATE DOMAIN image AS jsonb 
-  CHECK (
-  value ?& ARRAY['url', 'mime']
-    AND (value ->> 'url') ~ E'^(https?)://[^\\s/$.?#].[^\\s]*$'
-);
-
-COMMENT ON DOMAIN image IS '@name pgpmInternalTypeImage';
-
-CREATE DOMAIN multiple_select AS jsonb 
-  CHECK (value ?& ARRAY['value']);
-
-COMMENT ON DOMAIN multiple_select IS '@name pgpmInternalTypeMultipleSelect';
-
-CREATE DOMAIN origin AS text 
-  CHECK (value = pg_catalog."substring"(value, '^(https?://[^/]*)'));
-
-COMMENT ON DOMAIN origin IS '@name pgpmInternalTypeOrigin';
-
-CREATE DOMAIN single_select AS jsonb 
-  CHECK (value ?& ARRAY['value']);
-
-COMMENT ON DOMAIN single_select IS '@name pgpmInternalTypeSingleSelect';
-
-CREATE DOMAIN upload AS jsonb 
-  CHECK (
-  value ?& ARRAY['url', 'mime']
-    AND (value ->> 'url') ~ E'^(https?)://[^\\s/$.?#].[^\\s]*$'
-);
-
-COMMENT ON DOMAIN upload IS '@name pgpmInternalTypeUpload';
-
-CREATE DOMAIN url AS text 
-  CHECK (value ~ E'^(https?)://[^\\s/$.?#].[^\\s]*$');
-
-COMMENT ON DOMAIN url IS '@name pgpmInternalTypeUrl';

package/verify/schemas/public/domains/multiple_select.sql

@@ -1,7 +0,0 @@
--- Verify schemas/public/domains/multiple_select on pg
-
-BEGIN;
-
-SELECT verify_domain ('public.multiple_select');
-
-ROLLBACK;

package/verify/schemas/public/domains/single_select.sql

@@ -1,7 +0,0 @@
--- Verify schemas/public/domains/single_select on pg
-
-BEGIN;
-
-SELECT verify_domain ('public.single_select');
-
-ROLLBACK;