Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/metaschema-schema/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ Application-level metadata:
- **apis**: API configurations
- **api_extensions**: API extension relationships
- **api_modules**: API module definitions
- **api_schemata**: API schema configurations
- **api_schemas**: API schema configurations
- **sites**: Site definitions
- **apps**: Application definitions
- **domains**: Domain configurations
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
-- Revert schemas/services_public/tables/api_schemas/table from pg

BEGIN;

DROP TABLE services_public.api_schemas;

COMMIT;

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
-- Verify schemas/services_public/tables/api_schemas/table on pg

BEGIN;

SELECT verify_table ('services_public.api_schemas');

ROLLBACK;

This file was deleted.

4 changes: 2 additions & 2 deletions packages/services/__tests__/services.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -167,14 +167,14 @@ describe('services functionality', () => {
);

const [publicAssoc] = await pg.any(
`INSERT INTO services_public.api_schemata (database_id, schema_id, api_id)
`INSERT INTO services_public.api_schemas (database_id, schema_id, api_id)
VALUES ($1, $2, $3)
RETURNING *`,
[database_id, schema.id, objs.apis.public.id]
);

const [adminAssoc] = await pg.any(
`INSERT INTO services_public.api_schemata (database_id, schema_id, api_id)
`INSERT INTO services_public.api_schemas (database_id, schema_id, api_id)
VALUES ($1, $2, $3)
RETURNING *`,
[database_id, schema.id, objs.apis.admin.id]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
-- Deploy schemas/services_public/tables/api_schemata/table to pg
-- Deploy schemas/services_public/tables/api_schemas/table to pg

-- requires: schemas/services_public/schema

BEGIN;

CREATE TABLE services_public.api_schemata (
CREATE TABLE services_public.api_schemas (
id uuid PRIMARY KEY DEFAULT uuid_generate_v4 (),
database_id uuid NOT NULL,
schema_id uuid NOT NULL,
Expand All @@ -18,13 +18,13 @@ CREATE TABLE services_public.api_schemata (
unique(api_id, schema_id)
);

-- COMMENT ON CONSTRAINT schema_fkey ON services_public.api_schemata IS E'@omit manyToMany';
-- COMMENT ON CONSTRAINT api_fkey ON services_public.api_schemata IS E'@omit manyToMany';
COMMENT ON CONSTRAINT db_fkey ON services_public.api_schemata IS E'@omit manyToMany';
-- COMMENT ON CONSTRAINT schema_fkey ON services_public.api_schemas IS E'@omit manyToMany';
-- COMMENT ON CONSTRAINT api_fkey ON services_public.api_schemas IS E'@omit manyToMany';
COMMENT ON CONSTRAINT db_fkey ON services_public.api_schemas IS E'@omit manyToMany';


CREATE INDEX api_schemata_database_id_idx ON services_public.api_schemata ( database_id );
CREATE INDEX api_schemata_schema_id_idx ON services_public.api_schemata ( schema_id );
CREATE INDEX api_schemata_api_id_idx ON services_public.api_schemata ( api_id );
CREATE INDEX api_schemas_database_id_idx ON services_public.api_schemas ( database_id );
CREATE INDEX api_schemas_schema_id_idx ON services_public.api_schemas ( schema_id );
CREATE INDEX api_schemas_api_id_idx ON services_public.api_schemas ( api_id );

COMMIT;
2 changes: 1 addition & 1 deletion packages/services/pgpm.plan
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ schemas/services_public/schema 2017-08-11T08:11:51Z skitch <skitch@5b0c196eeb62>
schemas/services_public/tables/apis/table [schemas/services_public/schema metaschema-schema:schemas/metaschema_public/tables/database/table] 2017-08-11T08:11:51Z skitch <skitch@5b0c196eeb62> # add schemas/services_public/tables/apis/table
schemas/services_public/tables/api_extensions/table [schemas/services_public/schema schemas/services_public/tables/apis/table metaschema-schema:schemas/metaschema_public/tables/database_extension/table metaschema-schema:schemas/metaschema_public/tables/extension/table metaschema-schema:schemas/metaschema_public/tables/database/table] 2017-08-11T08:11:51Z skitch <skitch@5b0c196eeb62> # add schemas/services_public/tables/api_extensions/table
schemas/services_public/tables/api_modules/table [schemas/services_public/schema schemas/services_public/tables/apis/table metaschema-schema:schemas/metaschema_public/tables/database/table] 2017-08-11T08:11:51Z skitch <skitch@5b0c196eeb62> # add schemas/services_public/tables/api_modules/table
schemas/services_public/tables/api_schemata/table [schemas/services_public/schema] 2017-08-11T08:11:51Z skitch <skitch@5b0c196eeb62> # add schemas/services_public/tables/api_schemata/table
schemas/services_public/tables/api_schemas/table [schemas/services_public/schema] 2017-08-11T08:11:51Z skitch <skitch@5b0c196eeb62> # add schemas/services_public/tables/api_schemas/table
schemas/services_public/tables/sites/table [schemas/services_public/schema metaschema-schema:schemas/metaschema_public/tables/database/table] 2017-08-11T08:11:51Z skitch <skitch@5b0c196eeb62> # add schemas/services_public/tables/sites/table
schemas/services_public/tables/apps/table [schemas/services_public/schema schemas/services_public/tables/sites/table metaschema-schema:schemas/metaschema_public/tables/database/table] 2017-08-11T08:11:51Z skitch <skitch@5b0c196eeb62> # add schemas/services_public/tables/apps/table
schemas/services_public/tables/domains/table [schemas/services_public/schema schemas/services_public/tables/apis/table schemas/services_public/tables/sites/table metaschema-schema:schemas/metaschema_public/tables/database/table] 2017-08-11T08:11:51Z skitch <skitch@5b0c196eeb62> # add schemas/services_public/tables/domains/table
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
-- Revert schemas/services_public/tables/api_schemas/table from pg

BEGIN;

DROP TABLE services_public.api_schemas;

COMMIT;

This file was deleted.