@pgpm/types 0.15.3 → 0.15.4

package/Makefile

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pgpm/types",
-  "version": "0.15.3",
+  "version": "0.15.4",
   "description": "Core PostgreSQL data types with deploy/verify/revert SQL scripts",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "contributors": [
@@ -21,10 +21,10 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@pgpm/verify": "0.15.3"
+    "@pgpm/verify": "0.15.4"
   },
   "devDependencies": {
-    "pgpm": "^1.0.0"
+    "pgpm": "^1.2.2"
   },
   "repository": {
     "type": "git",
@@ -34,5 +34,5 @@
   "bugs": {
     "url": "https://github.com/constructive-io/pgpm-modules/issues"
   },
-  "gitHead": "187ed37f6b731132fe930acf5b5996b1e63ecca0"
+  "gitHead": "aad0dbef0336d6c18d027120ef9addc418822edd"
 }

package/pgpm-types.control

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

package/sql/{pgpm-types--0.15.2.sql → pgpm-types--0.15.3.sql}

@@ -28,7 +28,7 @@ CREATE DOMAIN multiple_select AS jsonb
 COMMENT ON DOMAIN multiple_select IS '@name pgpmInternalTypeMultipleSelect';
 
 CREATE DOMAIN origin AS text 
-  CHECK (value = SUBSTRING(value FROM '^(https?://[^/]*)'));
+  CHECK (value = pg_catalog."substring"(value, '^(https?://[^/]*)'));
 
 COMMENT ON DOMAIN origin IS '@name pgpmInternalTypeOrigin';
 

package/__tests__/domains.pgutils.test.ts

@@ -1,237 +0,0 @@
-import { getConnections, PgTestClient } from 'pgsql-test';
-
-const validUrls = [
-  'http://foo.com/blah_blah',
-  'http://foo.com/blah_blah/',
-  'http://foo.com/blah_blah_(wikipedia)',
-  'http://foo.com/blah_blah_(wikipedia)_(again)',
-  'http://www.example.com/wpstyle/?p=364',
-  'https://www.example.com/foo/?bar=baz&inga=42&quux',
-  'http://✪df.ws/123',
-  'http://foo.com/blah_(wikipedia)#cite-1',
-  'http://foo.com/blah_(wikipedia)_blah#cite-1',
-  'http://foo.com/(something)?after=parens',
-  'http://code.google.com/events/#&product=browser',
-  'http://j.mp',
-  'http://foo.bar/?q=Test%20URL-encoded%20stuff',
-  'http://مثال.إختبار',
-  'http://例子.测试',
-  'http://उदाहरण.परीक्षा',
-  "http://-.~_!$&'()*+,;=:%40:80%2f::::::@example.com",
-  'http://1337.net',
-  'http://a.b-c.de',
-  'https://foo_bar.example.com/'
-];
-
-const invalidUrls = [
-  'http://##',
-  'http://##/',
-  'http://foo.bar?q=Spaces should be encoded',
-  '//',
-  '//a',
-  '///a',
-  '///',
-  'http:///a',
-  'foo.com',
-  'rdar://1234',
-  'h://test',
-  'http:// shouldfail.com',
-  ':// should fail',
-  'http://foo.bar/foo(bar)baz quux',
-  'ftps://foo.bar/',
-  'http://.www.foo.bar/',
-  'http://.www.foo.bar./'
-];
-
-const validAttachments = [
-  'http://www.foo.bar/some.jpg',
-  'https://foo.bar/some.PNG'
-];
-
-const invalidAttachments = [
-  'hi there',
-  'ftp://foo.bar/some.png',
-  'https:///foo.bar/some.png'
-];
-
-const validImages = [
-  { url: 'http://www.foo.bar/some.jpg', mime: 'image/jpg' },
-  { url: 'https://foo.bar/some.PNG', mime: 'image/jpg' }
-];
-
-const invalidImages = [
-  { url: 'hi there' },
-  { url: 'https://foo.bar/some.png' }
-];
-
-const validUploads = [
-  { url: 'http://www.foo.bar/some.jpg', mime: 'image/jpg' },
-  { url: 'https://foo.bar/some.PNG', mime: 'image/png' }
-];
-
-const invalidUploads = [
-  { url: 'hi there' },
-  { url: 'https://foo.bar/some.png' },
-  { url: 'ftp://foo.bar/some.png', mime: 'image/png' }
-];
-
-let pg: PgTestClient;
-let teardown:  () => Promise<void>;
-
-beforeAll(async () => {
-  ({ pg, teardown } = await getConnections());
-});
-
-beforeAll(async () => {
-  await pg.any(`
-CREATE TABLE customers (
-  id serial,
-  url url,
-  image image,
-  attachment attachment,
-  domain hostname,
-  email email,
-  upload upload
-);
-  `);
-});
-
-beforeEach(async () => {
-  await pg.beforeEach();
-});
-
-afterEach(async () => {
-  await pg.afterEach();
-});
-
-afterAll(async () => {
-  await teardown();
-});
-
-describe('types', () => {
-  it('valid attachment and image', async () => {
-    for (const attachment of validAttachments) {
-      await pg.any(`INSERT INTO customers (attachment) VALUES ($1);`, [attachment]);
-    }
-
-    for (const image of validImages) {
-      await pg.any(`INSERT INTO customers (image) VALUES ($1::json);`, [image]);
-    }
-  });
-
-  it('invalid attachment and image', async () => {
-    for (const attachment of invalidAttachments) {
-      let failed = false;
-      try {
-        await pg.any(`INSERT INTO customers (attachment) VALUES ($1);`, [attachment]);
-      } catch (e) {
-        failed = true;
-      }
-      expect(failed).toBe(true);
-    }
-
-    for (const image of invalidImages) {
-      let failed = false;
-      try {
-        await pg.any(`INSERT INTO customers (image) VALUES ($1::json);`, [image]);
-      } catch (e) {
-        failed = true;
-      }
-      expect(failed).toBe(true);
-    }
-  });
-
-  it('valid upload', async () => {
-    for (const upload of validUploads) {
-      await pg.any(`INSERT INTO customers (upload) VALUES ($1::json);`, [upload]);
-    }
-  });
-
-  it('invalid upload', async () => {
-    for (const upload of invalidUploads) {
-      let failed = false;
-      try {
-        await pg.any(`INSERT INTO customers (upload) VALUES ($1::json);`, [upload]);
-      } catch (e) {
-        failed = true;
-      }
-      expect(failed).toBe(true);
-    }
-  });
-
-  it('valid url', async () => {
-    for (const value of validUrls) {
-      await pg.any(`INSERT INTO customers (url) VALUES ($1);`, [value]);
-    }
-  });
-
-  it('invalid url', async () => {
-    for (const value of invalidUrls) {
-      let failed = false;
-      try {
-        await pg.any(`INSERT INTO customers (url) VALUES ($1);`, [value]);
-      } catch (e) {
-        failed = true;
-      }
-      expect(failed).toBe(true);
-    }
-  });
-
-  it('email', async () => {
-    await pg.any(`
-    INSERT INTO customers (email) VALUES
-    ('d@google.com'),
-    ('d@google.in'),
-    ('d@google.in'),
-    ('d@www.google.in'),
-    ('d@google.io'),
-    ('dan@google.some.other.com')`);
-  });
-
-  it('not email', async () => {
-    let failed = false;
-    try {
-      await pg.any(`
-      INSERT INTO customers (email) VALUES
-      ('http://google.some.other.com')`);
-    } catch (e) {
-      failed = true;
-    }
-    expect(failed).toBe(true);
-  });
-
-  it('hostname', async () => {
-    await pg.any(`
-    INSERT INTO customers (domain) VALUES
-    ('google.com'),
-    ('google.in'),
-    ('google.in'),
-    ('www.google.in'),
-    ('google.io'),
-    ('google.some.other.com')`);
-  });
-
-  it('not hostname', async () => {
-    let failed = false;
-    try {
-      await pg.any(`
-      INSERT INTO customers (domain) VALUES
-      ('http://google.some.other.com')`);
-    } catch (e) {
-      failed = true;
-    }
-    expect(failed).toBe(true);
-  });
-
-  it('not hostname 2', async () => {
-    let failed = false;
-    try {
-      await pg.any(`
-      INSERT INTO customers (domain) VALUES
-      ('google.some.other.com/a/b/d')`);
-    } catch (e) {
-      failed = true;
-    }
-    expect(failed).toBe(true);
-  });
-});

package/__tests__/domains.test.ts

@@ -1,237 +0,0 @@
-import { getConnections, PgTestClient } from 'pgsql-test';
-
-const validUrls = [
-  'http://foo.com/blah_blah',
-  'http://foo.com/blah_blah/',
-  'http://foo.com/blah_blah_(wikipedia)',
-  'http://foo.com/blah_blah_(wikipedia)_(again)',
-  'http://www.example.com/wpstyle/?p=364',
-  'https://www.example.com/foo/?bar=baz&inga=42&quux',
-  'http://✪df.ws/123',
-  'http://foo.com/blah_(wikipedia)#cite-1',
-  'http://foo.com/blah_(wikipedia)_blah#cite-1',
-  'http://foo.com/(something)?after=parens',
-  'http://code.google.com/events/#&product=browser',
-  'http://j.mp',
-  'http://foo.bar/?q=Test%20URL-encoded%20stuff',
-  'http://مثال.إختبار',
-  'http://例子.测试',
-  'http://उदाहरण.परीक्षा',
-  "http://-.~_!$&'()*+,;=:%40:80%2f::::::@example.com",
-  'http://1337.net',
-  'http://a.b-c.de',
-  'https://foo_bar.example.com/'
-];
-
-const invalidUrls = [
-  'http://##',
-  'http://##/',
-  'http://foo.bar?q=Spaces should be encoded',
-  '//',
-  '//a',
-  '///a',
-  '///',
-  'http:///a',
-  'foo.com',
-  'rdar://1234',
-  'h://test',
-  'http:// shouldfail.com',
-  ':// should fail',
-  'http://foo.bar/foo(bar)baz quux',
-  'ftps://foo.bar/',
-  'http://.www.foo.bar/',
-  'http://.www.foo.bar./'
-];
-
-const validAttachments = [
-  'http://www.foo.bar/some.jpg',
-  'https://foo.bar/some.PNG'
-];
-
-const invalidAttachments = [
-  'hi there',
-  'ftp://foo.bar/some.png',
-  'https:///foo.bar/some.png'
-];
-
-const validImages = [
-  { url: 'http://www.foo.bar/some.jpg', mime: 'image/jpg' },
-  { url: 'https://foo.bar/some.PNG', mime: 'image/jpg' }
-];
-
-const invalidImages = [
-  { url: 'hi there' },
-  { url: 'https://foo.bar/some.png' }
-];
-
-const validUploads = [
-  { url: 'http://www.foo.bar/some.jpg', mime: 'image/jpg' },
-  { url: 'https://foo.bar/some.PNG', mime: 'image/png' }
-];
-
-const invalidUploads = [
-  { url: 'hi there' },
-  { url: 'https://foo.bar/some.png' },
-  { url: 'ftp://foo.bar/some.png', mime: 'image/png' }
-];
-
-let pg: PgTestClient;
-let teardown:  () => Promise<void>;
-
-beforeAll(async () => {
-  ({ pg, teardown } = await getConnections());
-});
-
-beforeAll(async () => {
-  await pg.any(`
-CREATE TABLE customers (
-  id serial,
-  url url,
-  image image,
-  attachment attachment,
-  domain hostname,
-  email email,
-  upload upload
-);
-  `);
-});
-
-beforeEach(async () => {
-  await pg.beforeEach();
-});
-
-afterEach(async () => {
-  await pg.afterEach();
-});
-
-afterAll(async () => {
-  await teardown();
-});
-
-describe('types', () => {
-  it('valid attachment and image', async () => {
-    for (const attachment of validAttachments) {
-      await pg.any(`INSERT INTO customers (attachment) VALUES ($1);`, [attachment]);
-    }
-
-    for (const image of validImages) {
-      await pg.any(`INSERT INTO customers (image) VALUES ($1::json);`, [image]);
-    }
-  });
-
-  it('invalid attachment and image', async () => {
-    for (const attachment of invalidAttachments) {
-      let failed = false;
-      try {
-        await pg.any(`INSERT INTO customers (attachment) VALUES ($1);`, [attachment]);
-      } catch (e) {
-        failed = true;
-      }
-      expect(failed).toBe(true);
-    }
-
-    for (const image of invalidImages) {
-      let failed = false;
-      try {
-        await pg.any(`INSERT INTO customers (image) VALUES ($1::json);`, [image]);
-      } catch (e) {
-        failed = true;
-      }
-      expect(failed).toBe(true);
-    }
-  });
-
-  it('valid upload', async () => {
-    for (const upload of validUploads) {
-      await pg.any(`INSERT INTO customers (upload) VALUES ($1::json);`, [upload]);
-    }
-  });
-
-  it('invalid upload', async () => {
-    for (const upload of invalidUploads) {
-      let failed = false;
-      try {
-        await pg.any(`INSERT INTO customers (upload) VALUES ($1::json);`, [upload]);
-      } catch (e) {
-        failed = true;
-      }
-      expect(failed).toBe(true);
-    }
-  });
-
-  it('valid url', async () => {
-    for (const value of validUrls) {
-      await pg.any(`INSERT INTO customers (url) VALUES ($1);`, [value]);
-    }
-  });
-
-  it('invalid url', async () => {
-    for (const value of invalidUrls) {
-      let failed = false;
-      try {
-        await pg.any(`INSERT INTO customers (url) VALUES ($1);`, [value]);
-      } catch (e) {
-        failed = true;
-      }
-      expect(failed).toBe(true);
-    }
-  });
-
-  it('email', async () => {
-    await pg.any(`
-    INSERT INTO customers (email) VALUES
-    ('d@google.com'),
-    ('d@google.in'),
-    ('d@google.in'),
-    ('d@www.google.in'),
-    ('d@google.io'),
-    ('dan@google.some.other.com')`);
-  });
-
-  it('not email', async () => {
-    let failed = false;
-    try {
-      await pg.any(`
-      INSERT INTO customers (email) VALUES
-      ('http://google.some.other.com')`);
-    } catch (e) {
-      failed = true;
-    }
-    expect(failed).toBe(true);
-  });
-
-  it('hostname', async () => {
-    await pg.any(`
-    INSERT INTO customers (domain) VALUES
-    ('google.com'),
-    ('google.in'),
-    ('google.in'),
-    ('www.google.in'),
-    ('google.io'),
-    ('google.some.other.com')`);
-  });
-
-  it('not hostname', async () => {
-    let failed = false;
-    try {
-      await pg.any(`
-      INSERT INTO customers (domain) VALUES
-      ('http://google.some.other.com')`);
-    } catch (e) {
-      failed = true;
-    }
-    expect(failed).toBe(true);
-  });
-
-  it('not hostname 2', async () => {
-    let failed = false;
-    try {
-      await pg.any(`
-      INSERT INTO customers (domain) VALUES
-      ('google.some.other.com/a/b/d')`);
-    } catch (e) {
-      failed = true;
-    }
-    expect(failed).toBe(true);
-  });
-});

package/__tests__/ext-types.test.ts

@@ -1,21 +0,0 @@
-import { getConnections, PgTestClient } from 'pgsql-test';
-
-let teardown: () => Promise<void>;
-let pg: PgTestClient;
-
-beforeAll(async () => {
-  ({ pg, teardown } = await getConnections());
-});
-
-afterAll(async () => {
-  await teardown();
-});
-
-describe('@pgql/types', () => {
-  it('creates domain types', async () => {
-    const { typname } = await pg.one(
-      `SELECT typname FROM pg_type WHERE typname = 'url'`
-    );
-    expect(typname).toBe('url');
-  });
-});