migration

Author: elpiel

sentry/migrations/20190806011140_initial_tables/up.sql

@@ -1,39 +1,39 @@
 CREATE TABLE channels
 (
-    channel_id     VARCHAR(66)              NOT NULL,
+    id             VARCHAR(66)              NOT NULL,
     creator        VARCHAR(255)             NOT NULL,
     deposit_asset  VARCHAR(42)              NOT NULL,
     deposit_amount VARCHAR(255)             NOT NULL, -- @TODO change the deposit to BigNum compatible field
     valid_until    TIMESTAMP WITH TIME ZONE NOT NULL,
     spec           JSONB                    NOT NULL,
 
-    PRIMARY KEY (channel_id)
+    PRIMARY KEY (id)
 );
 
-CREATE INDEX idx_valid_until ON channels(valid_until);
-CREATE INDEX idx_spec ON channels((spec->'validator'->>'id'));
+CREATE INDEX idx_valid_until ON channels (valid_until);
+CREATE INDEX idx_spec ON channels ((spec -> 'validator' ->> 'id'));
 
 CREATE TABLE validator_messages
 (
-    channel_id     VARCHAR(66)              NOT NULL,
-    "from"         VARCHAR(255)             NOT NULL,
-    msg            JSONB                    NOT NULL,
-    received       TIMESTAMP WITH TIME ZONE NOT NULL,
+    channel_id VARCHAR(66)              NOT NULL REFERENCES channels (id) ON DELETE RESTRICT,
+    "from"     VARCHAR(255)             NOT NULL,
+    msg        JSONB                    NOT NULL,
+    received   TIMESTAMP WITH TIME ZONE NOT NULL,
 
     PRIMARY KEY (channel_id)
 );
 
-CREATE INDEX idx_received ON validator_messages(received);
-CREATE INDEX ON validator_messages((msg->>'type'));
-CREATE INDEX ON validator_messages((msg->>'stateRoot'));
+CREATE INDEX idx_received ON validator_messages (received);
+CREATE INDEX ON validator_messages ((msg ->> 'type'));
+CREATE INDEX ON validator_messages ((msg ->> 'stateRoot'));
 
 CREATE TABLE event_aggregates
 (
-    channel_id    VARCHAR(66)              NOT NULL,
-    created       TIMESTAMP WITH TIME ZONE NOT NULL,
-    events        JSONB                    NOT NULL,
+    channel_id VARCHAR(66)              NOT NULL REFERENCES channels (id) ON DELETE RESTRICT,
+    created    TIMESTAMP WITH TIME ZONE NOT NULL,
+    events     JSONB                    NOT NULL,
 
     PRIMARY KEY (channel_id)
 );
 
-CREATE INDEX idx_created ON event_aggregates(created);
+CREATE INDEX idx_created ON event_aggregates (created);

sentry/src/middleware/channel.rs

@@ -25,7 +25,7 @@ pub async fn get_channel(
     pool
         .run(move |connection| {
             async move {
-                match connection.prepare("SELECT channel_id, creator, deposit_asset, deposit_amount, valid_until, spec FROM channels WHERE channel_id = $1 LIMIT 1").await {
+                match connection.prepare("SELECT id, creator, deposit_asset, deposit_amount, valid_until, spec FROM channels WHERE id = $1 LIMIT 1").await {
                     Ok(select) => match connection.query(&select, &[&id]).await {
                         Ok(results) => Ok(( results.get(0).map(Channel::from) , connection)),
                         Err(e) => Err((e, connection)),