diff --git a/federation/migration_federation_destination.sql b/federation/migration_federation_destination.sql deleted file mode 100644 index 4a0e1c736..000000000 --- a/federation/migration_federation_destination.sql +++ /dev/null @@ -1,56 +0,0 @@ --- Pricebook module - --- id | rel_namespace | handle | name | meta | created_at | updated_at | deleted_at --- --------------------+--------------------+-----------+-----------+------+-------------------------------+------------------------------+------------ --- 196342359342989413 | 196342358990667877 | Pricebook | Pricebook | {} | 2020-09-16 12:06:05.830318+00 | 2020-09-16 12:06:15.24715+00 | - -CREATE TABLE IF NOT EXISTS federation_module_shared -( - id BIGINT NOT NULL, - handle varchar(200), - name varchar(64), - rel_node BIGINT, - xref_module BIGINT, - fields TEXT, - PRIMARY KEY (id) -); - -CREATE TABLE IF NOT EXISTS federation_module_exposed -( - id BIGINT NOT NULL, - rel_node BIGINT, - rel_compose_module BIGINT, - fields TEXT, - PRIMARY KEY (id) -); - -CREATE TABLE IF NOT EXISTS federation_module_mapping -( - rel_federation_module BIGINT, - rel_compose_module BIGINT, - field_mapping TEXT -); - -CREATE TABLE IF NOT EXISTS federation_node -( - id BIGINT NOT NULL, - name varchar(256), - status varchar(64), - structure_status varchar(64), - structure_synced_at varchar(64), - data_status varchar(64), - data_synced_at varchar(64), - PRIMARY KEY(id) -); - -TRUNCATE TABLE federation_node; -TRUNCATE TABLE federation_module_shared; -TRUNCATE TABLE federation_module_exposed; -TRUNCATE TABLE federation_module_mapping; - -INSERT INTO federation_node values ('276342359342989555', 'Node Origin (somewhere else)', 'paired', 'synced', now(), 'synced', now()); - -INSERT INTO federation_module_shared (id, handle, name, rel_node, xref_module, fields) -VALUES -(206342359342988000, 'Pricebook_on_origin_somewhere_else', 'Pricebook on some other origin (somewhere else)', 276342359342989555, 196342359342989000, '[]') -; diff --git a/federation/migration_federation_origin.sql b/federation/migration_federation_origin.sql deleted file mode 100644 index 1168b922c..000000000 --- a/federation/migration_federation_origin.sql +++ /dev/null @@ -1,61 +0,0 @@ --- Pricebook module - --- id | rel_namespace | handle | name | meta | created_at | updated_at | deleted_at --- --------------------+--------------------+-----------+-----------+------+-------------------------------+------------------------------+------------ --- 196342359342989413 | 196342358990667877 | Pricebook | Pricebook | {} | 2020-09-16 12:06:05.830318+00 | 2020-09-16 12:06:15.24715+00 | - -CREATE TABLE IF NOT EXISTS federation_module_shared -( - id BIGINT NOT NULL, - handle varchar(200), - name varchar(64), - rel_node BIGINT, - xref_module BIGINT, - fields TEXT, - PRIMARY KEY (id) -); - -CREATE TABLE IF NOT EXISTS federation_module_exposed -( - id BIGINT NOT NULL, - rel_node BIGINT, - rel_compose_module BIGINT, - fields TEXT, - PRIMARY KEY (id) -); - -CREATE TABLE IF NOT EXISTS federation_module_mapping -( - rel_federation_module BIGINT, - rel_compose_module BIGINT, - field_mapping TEXT -); - -CREATE TABLE IF NOT EXISTS federation_node -( - id BIGINT NOT NULL, - name varchar(256), - status varchar(64), - structure_status varchar(64), - structure_synced_at varchar(64), - data_status varchar(64), - data_synced_at varchar(64), - PRIMARY KEY(id) -); - -TRUNCATE TABLE federation_node; -TRUNCATE TABLE federation_module_shared; -TRUNCATE TABLE federation_module_exposed; -TRUNCATE TABLE federation_module_mapping; - -INSERT INTO federation_node values ('276342359342989444', 'Node Destination (somewhere else)', 'paired', 'synced', now(), 'synced', now()); - -INSERT INTO federation_module_exposed (id, rel_node, rel_compose_module, fields) -VALUES -(196342359342989000, 276342359342989444, 196342359342989413, '[]') -; - -INSERT INTO federation_module_shared (id, handle, name, rel_node, xref_module, fields) -VALUES -(196342359342988000, 'Pricebook_on_origin_somewhere_else', 'Pricebook on some other origin (somewhere else)', 276342359342989444, 123456789012345678, '[]') -; diff --git a/store/federation_exposed_modules.yaml b/store/federation_exposed_modules.yaml index da9568d57..73f8bb6b5 100644 --- a/store/federation_exposed_modules.yaml +++ b/store/federation_exposed_modules.yaml @@ -9,7 +9,9 @@ fields: - { field: NodeID } - { field: ComposeModuleID } - { field: Fields, type: "json.Text" } - + - { field: CreatedAt, sortable: true } + - { field: UpdatedAt, sortable: true } + - { field: DeletedAt, sortable: true } lookups: - fields: [ID] diff --git a/store/rdbms/federation_exposed_modules.gen.go b/store/rdbms/federation_exposed_modules.gen.go index 08eae4616..15bd2f146 100644 --- a/store/rdbms/federation_exposed_modules.gen.go +++ b/store/rdbms/federation_exposed_modules.gen.go @@ -378,6 +378,9 @@ func (s Store) internalFederationExposedModuleRowScanner(row rowScanner) (res *t &res.NodeID, &res.ComposeModuleID, &res.Fields, + &res.CreatedAt, + &res.UpdatedAt, + &res.DeletedAt, ) } @@ -421,6 +424,9 @@ func (Store) federationExposedModuleColumns(aa ...string) []string { alias + "rel_node", alias + "rel_compose_module", alias + "fields", + alias + "created_at", + alias + "updated_at", + alias + "deleted_at", } } @@ -432,6 +438,9 @@ func (Store) federationExposedModuleColumns(aa ...string) []string { func (Store) sortableFederationExposedModuleColumns() []string { return []string{ "id", + "created_at", + "updated_at", + "deleted_at", } } @@ -445,6 +454,9 @@ func (s Store) internalFederationExposedModuleEncoder(res *types.ExposedModule) "rel_node": res.NodeID, "rel_compose_module": res.ComposeModuleID, "fields": res.Fields, + "created_at": res.CreatedAt, + "updated_at": res.UpdatedAt, + "deleted_at": res.DeletedAt, } } @@ -474,6 +486,14 @@ func (s Store) collectFederationExposedModuleCursorValues(res *types.ExposedModu cursor.Set(c, res.ID, false) pkId = true + case "created_at": + cursor.Set(c, res.CreatedAt, false) + + case "updated_at": + cursor.Set(c, res.UpdatedAt, false) + + case "deleted_at": + cursor.Set(c, res.DeletedAt, false) } } diff --git a/store/rdbms/rdbms_schema.go b/store/rdbms/rdbms_schema.go index 45c540475..8bcaa8ee2 100644 --- a/store/rdbms/rdbms_schema.go +++ b/store/rdbms/rdbms_schema.go @@ -509,6 +509,7 @@ func (Schema) FederationModuleExposed() *Table { ColumnDef("rel_node", ColumnTypeIdentifier), ColumnDef("rel_compose_module", ColumnTypeIdentifier), ColumnDef("fields", ColumnTypeText), + CUDTimestamps, AddIndex("unique_node_composemodule", IColumn("rel_node", "rel_compose_module")), )