From 0fb07a0a778a98ef0cda4502bcd7b9debf079ea6 Mon Sep 17 00:00:00 2001 From: i-norden Date: Thu, 18 Nov 2021 07:33:22 -0600 Subject: [PATCH] use node_id as PK/FK --- .../00002_create_nodes_table.sql | 6 +- .../00004_create_eth_header_cids_table.sql | 2 +- db/migrations/00002_create_nodes_table.sql | 6 +- .../00004_create_eth_header_cids_table.sql | 2 +- schema.sql | 113 +----------------- 5 files changed, 10 insertions(+), 119 deletions(-) diff --git a/db/batch_process_migrations/00002_create_nodes_table.sql b/db/batch_process_migrations/00002_create_nodes_table.sql index e70c144..2a4ecdd 100644 --- a/db/batch_process_migrations/00002_create_nodes_table.sql +++ b/db/batch_process_migrations/00002_create_nodes_table.sql @@ -1,12 +1,10 @@ -- +goose Up CREATE TABLE nodes ( - id SERIAL PRIMARY KEY, client_name VARCHAR, genesis_block VARCHAR(66), network_id VARCHAR, - node_id VARCHAR(128), - chain_id INTEGER DEFAULT 1, - CONSTRAINT node_uc UNIQUE (genesis_block, network_id, node_id, chain_id) + node_id VARCHAR(128) PRIMARY KEY, + chain_id INTEGER DEFAULT 1 ); -- +goose Down diff --git a/db/batch_process_migrations/00004_create_eth_header_cids_table.sql b/db/batch_process_migrations/00004_create_eth_header_cids_table.sql index f280c90..6754c7e 100644 --- a/db/batch_process_migrations/00004_create_eth_header_cids_table.sql +++ b/db/batch_process_migrations/00004_create_eth_header_cids_table.sql @@ -6,7 +6,7 @@ CREATE TABLE eth.header_cids ( cid TEXT NOT NULL, mh_key TEXT NOT NULL, td NUMERIC NOT NULL, - node_id INTEGER NOT NULL REFERENCES nodes (id) ON DELETE CASCADE, + node_id VARCHAR(128) NOT NULL REFERENCES nodes (node_id) ON DELETE CASCADE, reward NUMERIC NOT NULL, state_root VARCHAR(66) NOT NULL, tx_root VARCHAR(66) NOT NULL, diff --git a/db/migrations/00002_create_nodes_table.sql b/db/migrations/00002_create_nodes_table.sql index e70c144..2a4ecdd 100644 --- a/db/migrations/00002_create_nodes_table.sql +++ b/db/migrations/00002_create_nodes_table.sql @@ -1,12 +1,10 @@ -- +goose Up CREATE TABLE nodes ( - id SERIAL PRIMARY KEY, client_name VARCHAR, genesis_block VARCHAR(66), network_id VARCHAR, - node_id VARCHAR(128), - chain_id INTEGER DEFAULT 1, - CONSTRAINT node_uc UNIQUE (genesis_block, network_id, node_id, chain_id) + node_id VARCHAR(128) PRIMARY KEY, + chain_id INTEGER DEFAULT 1 ); -- +goose Down diff --git a/db/migrations/00004_create_eth_header_cids_table.sql b/db/migrations/00004_create_eth_header_cids_table.sql index f5a8a1c..e2c8d90 100644 --- a/db/migrations/00004_create_eth_header_cids_table.sql +++ b/db/migrations/00004_create_eth_header_cids_table.sql @@ -6,7 +6,7 @@ CREATE TABLE eth.header_cids ( cid TEXT NOT NULL, mh_key TEXT NOT NULL REFERENCES public.blocks (key) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, td NUMERIC NOT NULL, - node_id INTEGER NOT NULL REFERENCES nodes (id) ON DELETE CASCADE, + node_id VARCHAR(128) NOT NULL REFERENCES nodes (node_id) ON DELETE CASCADE, reward NUMERIC NOT NULL, state_root VARCHAR(66) NOT NULL, tx_root VARCHAR(66) NOT NULL, diff --git a/schema.sql b/schema.sql index c864dae..b740a21 100644 --- a/schema.sql +++ b/schema.sql @@ -38,7 +38,7 @@ CREATE TABLE eth.header_cids ( cid text NOT NULL, mh_key text NOT NULL, td numeric NOT NULL, - node_id integer NOT NULL, + node_id character varying(128) NOT NULL, reward numeric NOT NULL, state_root character varying(66) NOT NULL, tx_root character varying(66) NOT NULL, @@ -75,34 +75,6 @@ CREATE TYPE public.child_result AS ( ); --- --- Name: graphql_subscription(); Type: FUNCTION; Schema: eth; Owner: - --- - -CREATE FUNCTION eth.graphql_subscription() RETURNS trigger - LANGUAGE plpgsql - AS $_$ -declare - table_name text = TG_ARGV[0]; - attribute text = TG_ARGV[1]; - id text; -begin - execute 'select $1.' || quote_ident(attribute) - using new - into id; - perform pg_notify('postgraphile:' || table_name, - json_build_object( - '__node__', json_build_array( - table_name, - id - ) - )::text - ); - return new; -end; -$_$; - - -- -- Name: canonical_header_from_array(eth.header_cids[]); Type: FUNCTION; Schema: public; Owner: - -- @@ -416,11 +388,10 @@ ALTER SEQUENCE public.goose_db_version_id_seq OWNED BY public.goose_db_version.i -- CREATE TABLE public.nodes ( - id integer NOT NULL, client_name character varying, genesis_block character varying(66), network_id character varying, - node_id character varying(128), + node_id character varying(128) NOT NULL, chain_id integer DEFAULT 1 ); @@ -439,26 +410,6 @@ COMMENT ON TABLE public.nodes IS '@name NodeInfo'; COMMENT ON COLUMN public.nodes.node_id IS '@name ChainNodeID'; --- --- Name: nodes_id_seq; Type: SEQUENCE; Schema: public; Owner: - --- - -CREATE SEQUENCE public.nodes_id_seq - AS integer - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE - CACHE 1; - - --- --- Name: nodes_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: - --- - -ALTER SEQUENCE public.nodes_id_seq OWNED BY public.nodes.id; - - -- -- Name: goose_db_version id; Type: DEFAULT; Schema: public; Owner: - -- @@ -466,13 +417,6 @@ ALTER SEQUENCE public.nodes_id_seq OWNED BY public.nodes.id; ALTER TABLE ONLY public.goose_db_version ALTER COLUMN id SET DEFAULT nextval('public.goose_db_version_id_seq'::regclass); --- --- Name: nodes id; Type: DEFAULT; Schema: public; Owner: - --- - -ALTER TABLE ONLY public.nodes ALTER COLUMN id SET DEFAULT nextval('public.nodes_id_seq'::regclass); - - -- -- Name: access_list_element access_list_element_pkey; Type: CONSTRAINT; Schema: eth; Owner: - -- @@ -574,7 +518,7 @@ ALTER TABLE ONLY public.nodes -- ALTER TABLE ONLY public.nodes - ADD CONSTRAINT nodes_pkey PRIMARY KEY (id); + ADD CONSTRAINT nodes_pkey PRIMARY KEY (node_id); -- @@ -836,55 +780,6 @@ CREATE INDEX tx_src_index ON eth.transaction_cids USING btree (src); CREATE INDEX uncle_header_id_index ON eth.uncle_cids USING btree (header_id); --- --- Name: header_cids header_cids_ai; Type: TRIGGER; Schema: eth; Owner: - --- - -CREATE TRIGGER header_cids_ai AFTER INSERT ON eth.header_cids FOR EACH ROW EXECUTE FUNCTION eth.graphql_subscription('header_cids', 'id'); - - --- --- Name: receipt_cids receipt_cids_ai; Type: TRIGGER; Schema: eth; Owner: - --- - -CREATE TRIGGER receipt_cids_ai AFTER INSERT ON eth.receipt_cids FOR EACH ROW EXECUTE FUNCTION eth.graphql_subscription('receipt_cids', 'id'); - - --- --- Name: state_accounts state_accounts_ai; Type: TRIGGER; Schema: eth; Owner: - --- - -CREATE TRIGGER state_accounts_ai AFTER INSERT ON eth.state_accounts FOR EACH ROW EXECUTE FUNCTION eth.graphql_subscription('state_accounts', 'id'); - - --- --- Name: state_cids state_cids_ai; Type: TRIGGER; Schema: eth; Owner: - --- - -CREATE TRIGGER state_cids_ai AFTER INSERT ON eth.state_cids FOR EACH ROW EXECUTE FUNCTION eth.graphql_subscription('state_cids', 'id'); - - --- --- Name: storage_cids storage_cids_ai; Type: TRIGGER; Schema: eth; Owner: - --- - -CREATE TRIGGER storage_cids_ai AFTER INSERT ON eth.storage_cids FOR EACH ROW EXECUTE FUNCTION eth.graphql_subscription('storage_cids', 'id'); - - --- --- Name: transaction_cids transaction_cids_ai; Type: TRIGGER; Schema: eth; Owner: - --- - -CREATE TRIGGER transaction_cids_ai AFTER INSERT ON eth.transaction_cids FOR EACH ROW EXECUTE FUNCTION eth.graphql_subscription('transaction_cids', 'id'); - - --- --- Name: uncle_cids uncle_cids_ai; Type: TRIGGER; Schema: eth; Owner: - --- - -CREATE TRIGGER uncle_cids_ai AFTER INSERT ON eth.uncle_cids FOR EACH ROW EXECUTE FUNCTION eth.graphql_subscription('uncle_cids', 'id'); - - -- -- Name: access_list_element access_list_element_tx_id_fkey; Type: FK CONSTRAINT; Schema: eth; Owner: - -- @@ -906,7 +801,7 @@ ALTER TABLE ONLY eth.header_cids -- ALTER TABLE ONLY eth.header_cids - ADD CONSTRAINT header_cids_node_id_fkey FOREIGN KEY (node_id) REFERENCES public.nodes(id) ON DELETE CASCADE; + ADD CONSTRAINT header_cids_node_id_fkey FOREIGN KEY (node_id) REFERENCES public.nodes(node_id) ON DELETE CASCADE; --