storage/roflmarket: Fix roflmarket table constrains

Author: ptrus

.changelog/1063.bugfix.md

@@ -0,0 +1 @@
+storage/roflmarket: Fix roflmarket tables constrains

analyzer/queries/queries.go

@@ -1451,9 +1451,8 @@ var (
 	RuntimeRoflmarketOfferUpsert = `
     INSERT INTO chain.roflmarket_offers (runtime, id, provider, resources, payment, capacity, metadata)
     VALUES ($1, $2, $3, $4, $5, $6, $7)
-    ON CONFLICT (runtime, id) DO UPDATE
+    ON CONFLICT (runtime, provider, id) DO UPDATE
     SET
-      provider = excluded.provider,
       resources = excluded.resources,
       payment = excluded.payment,
       capacity = excluded.capacity,
@@ -1462,9 +1461,8 @@ var (
 	RuntimeRoflmarketInstanceUpsert = `
     INSERT INTO chain.roflmarket_instances (runtime, id, provider, offer_id, status, creator, admin, node_id, metadata, resources, deployment, created_at, updated_at, paid_from, paid_until, payment, payment_address, refund_data, cmd_next_id, cmd_count, cmds)
     VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21)
-    ON CONFLICT (runtime, id) DO UPDATE
+    ON CONFLICT (runtime, provider, id) DO UPDATE
     SET
-      provider = excluded.provider,
       offer_id = excluded.offer_id,
       status = excluded.status,
       creator = excluded.creator,
@@ -1513,13 +1511,15 @@ var (
       removed = TRUE
     WHERE
       runtime = $1 AND
-      id = $2`
+      provider = $2 AND
+      id = $3`
 
 	RuntimeRoflmarketInstanceRemoved = `
     UPDATE chain.roflmarket_instances
     SET
       removed = TRUE
     WHERE
       runtime = $1 AND
-      id = $2`
+      provider = $2 AND
+      id = $3`
 )

analyzer/roflmarket/roflmarket.go

@@ -206,6 +206,7 @@ func (p *processor) queueRoflmarketOffersRefresh(ctx context.Context, batch *sto
 		batch.Queue(
 			queries.RuntimeRoflmarketOfferRemoved,
 			p.runtime,
+			providerAddress.String(),
 			offerID,
 		)
 	}
@@ -287,6 +288,7 @@ func (p *processor) queueRoflmarketInstancesRefresh(ctx context.Context, batch *
 		batch.Queue(
 			queries.RuntimeRoflmarketInstanceRemoved,
 			p.runtime,
+			providerAddress.String(),
 			instanceID,
 		)
 	}

storage/migrations/25_runtime_roflmarket.up.sql

@@ -40,7 +40,8 @@ CREATE TABLE chain.roflmarket_providers (
 CREATE TABLE chain.roflmarket_offers (
   runtime runtime NOT NULL,
   id BYTEA NOT NULL,
-  PRIMARY KEY (runtime, id),
+  PRIMARY KEY (runtime, id), -- Removed in 40_runtime_roflmarket_constraints_fix.up.sql.
+  -- PRIMARY KEY (runtime, provider, id), -- Added in 40_runtime_roflmarket_constraints_fix.up.sql.
 
   provider oasis_addr NOT NULL,
   FOREIGN KEY (runtime, provider) REFERENCES chain.roflmarket_providers(runtime, address) DEFERRABLE INITIALLY DEFERRED,
@@ -52,18 +53,20 @@ CREATE TABLE chain.roflmarket_offers (
 
   removed BOOLEAN NOT NULL DEFAULT FALSE
 );
-CREATE INDEX ix_roflmarket_offers_provider ON chain.roflmarket_offers (runtime, provider);
+CREATE INDEX ix_roflmarket_offers_provider ON chain.roflmarket_offers (runtime, provider); -- Removed in 40_runtime_roflmarket_constraints_fix.up.sql.
 
 CREATE TABLE chain.roflmarket_instances (
   runtime runtime NOT NULL,
   id BYTEA NOT NULL,
-  PRIMARY KEY (runtime, id),
+  PRIMARY KEY (runtime, id), -- Removed in 40_runtime_roflmarket_constraints_fix.up.sql.
+  -- PRIMARY KEY (runtime, provider, id), -- Added in 40_runtime_roflmarket_constraints_fix.up.sql.
 
   provider oasis_addr NOT NULL,
   FOREIGN KEY (runtime, provider) REFERENCES chain.roflmarket_providers(runtime, address) DEFERRABLE INITIALLY DEFERRED,
 
   offer_id BYTEA NOT NULL,
-  FOREIGN KEY (runtime, offer_id) REFERENCES chain.roflmarket_offers(runtime, id) DEFERRABLE INITIALLY DEFERRED,
+  FOREIGN KEY (runtime, offer_id) REFERENCES chain.roflmarket_offers(runtime, id) DEFERRABLE INITIALLY DEFERRED, -- Removed in 40_runtime_roflmarket_constraints_fix.up.sql.
+  -- FOREIGN KEY (runtime, provider, offer_id) REFERENCES chain.roflmarket_offers(runtime, provider, id) DEFERRABLE INITIALLY DEFERRED, -- Added in 40_runtime_roflmarket_constraints_fix.up.sql.
 
   status SMALLINT CHECK  (status >= 0 AND status <= 255),
   creator oasis_addr,
@@ -88,7 +91,7 @@ CREATE TABLE chain.roflmarket_instances (
 
   removed BOOLEAN NOT NULL DEFAULT FALSE
 );
-CREATE INDEX ix_roflmarket_instances_provider ON chain.roflmarket_instances (runtime, provider);
+CREATE INDEX ix_roflmarket_instances_provider ON chain.roflmarket_instances (runtime, provider); -- Removed in 40_runtime_roflmarket_constraints_fix.up.sql.
 -- CREATE INDEX ix_roflmarket_instances_admin ON chain.roflmarket_instances (runtime, admin); -- Added in 38_runtime_roflmarket_instances_admin.up.sql.
 
 -- Grant others read-only use.

storage/migrations/40_runtime_roflmarket_constraints_fix.up.sql

@@ -0,0 +1,32 @@
+BEGIN;
+
+-- Drop existing invalid FKs on roflmarket_instances.
+ALTER TABLE chain.roflmarket_instances
+  DROP CONSTRAINT roflmarket_instances_runtime_offer_id_fkey;
+
+-- Drop existing invalid PKs on roflmarket_offers and roflmarket_instances.
+ALTER TABLE chain.roflmarket_offers
+  DROP CONSTRAINT roflmarket_offers_pkey;
+
+ALTER TABLE chain.roflmarket_instances
+  DROP CONSTRAINT roflmarket_instances_pkey;
+
+-- Add new PKs with provider included.
+ALTER TABLE chain.roflmarket_offers
+  ADD PRIMARY KEY (runtime, provider, id);
+
+ALTER TABLE chain.roflmarket_instances
+  ADD PRIMARY KEY (runtime, provider, id);
+
+-- Add new FKs with provider included.
+ALTER TABLE chain.roflmarket_instances
+  ADD CONSTRAINT roflmarket_instances_runtime_provider_offer_id_fkey
+  FOREIGN KEY (runtime, provider, offer_id)
+  REFERENCES chain.roflmarket_offers(runtime, provider, id)
+  DEFERRABLE INITIALLY DEFERRED;
+
+-- Drop unneded index with the new PKs.
+DROP INDEX IF EXISTS chain.ix_roflmarket_offers_provider;
+DROP INDEX IF EXISTS chain.ix_roflmarket_instances_provider;
+
+COMMIT;