From 90c3fe7a25e5941985e5586ed2d8dd2b0fdecd91 Mon Sep 17 00:00:00 2001 From: kderme Date: Sat, 11 Sep 2021 20:56:11 +0300 Subject: [PATCH 1/2] Use non detailed json schema --- cardano-db-sync/src/Cardano/DbSync/Era/Shelley/Generic/Tx.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cardano-db-sync/src/Cardano/DbSync/Era/Shelley/Generic/Tx.hs b/cardano-db-sync/src/Cardano/DbSync/Era/Shelley/Generic/Tx.hs index c2ceb43d1..c114f8706 100644 --- a/cardano-db-sync/src/Cardano/DbSync/Era/Shelley/Generic/Tx.hs +++ b/cardano-db-sync/src/Cardano/DbSync/Era/Shelley/Generic/Tx.hs @@ -460,7 +460,7 @@ fromAlonzoTx pp (blkIndex, tx) = encodeData :: Alonzo.Data StandardAlonzo -> ByteString encodeData dt = LBS.toStrict $ Aeson.encode $ - Api.scriptDataToJson Api.ScriptDataJsonDetailedSchema $ Api.fromAlonzoData dt + Api.scriptDataToJson Api.ScriptDataJsonNoSchema $ Api.fromAlonzoData dt txDataWitness :: [TxDatum] txDataWitness = From d407070f5160f279f4c214fa0e4f062fdcf1d338 Mon Sep 17 00:00:00 2001 From: kderme Date: Sat, 11 Sep 2021 00:53:26 +0300 Subject: [PATCH 2/2] Fix foreign keys --- cardano-db/src/Cardano/Db/Schema.hs | 4 ++-- schema/migration-2-0024-20210910.sql | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 schema/migration-2-0024-20210910.sql diff --git a/cardano-db/src/Cardano/Db/Schema.hs b/cardano-db/src/Cardano/Db/Schema.hs index 212552d9c..02315cbe8 100644 --- a/cardano-db/src/Cardano/Db/Schema.hs +++ b/cardano-db/src/Cardano/Db/Schema.hs @@ -414,7 +414,7 @@ share minPoolCost DbLovelace Maybe sqltype=lovelace coinsPerUtxoWord DbLovelace Maybe sqltype=lovelace - costModelsId CostModelsId Maybe + costModelsId CostModelsId Maybe OnDeleteCascade priceMem Double Maybe -- sqltype=rational priceStep Double Maybe -- sqltype=rational maxTxExMem DbWord64 Maybe sqltype=word64type @@ -452,7 +452,7 @@ share nonce ByteString Maybe sqltype=hash32type coinsPerUtxoWord DbLovelace Maybe sqltype=lovelace - costModelsId CostModelsId Maybe + costModelsId CostModelsId Maybe OnDeleteCascade priceMem Double Maybe -- sqltype=rational priceStep Double Maybe -- sqltype=rational maxTxExMem DbWord64 Maybe sqltype=word64type diff --git a/schema/migration-2-0024-20210910.sql b/schema/migration-2-0024-20210910.sql new file mode 100644 index 000000000..c5e2ffea9 --- /dev/null +++ b/schema/migration-2-0024-20210910.sql @@ -0,0 +1,23 @@ +-- Persistent generated migration. + +CREATE FUNCTION migrate() RETURNS void AS $$ +DECLARE + next_version int ; +BEGIN + SELECT stage_two + 1 INTO next_version FROM schema_version ; + IF next_version = 24 THEN + EXECUTE 'ALTER TABLE "redeemer" ADD CONSTRAINT "redeemer_datum_id_fkey" FOREIGN KEY("datum_id") REFERENCES "datum"("id") ON DELETE CASCADE ON UPDATE RESTRICT' ; + EXECUTE 'ALTER TABLE "param_proposal" DROP CONSTRAINT "param_proposal_cost_models_id_fkey"' ; + EXECUTE 'ALTER TABLE "param_proposal" ADD CONSTRAINT "param_proposal_cost_models_id_fkey" FOREIGN KEY("cost_models_id") REFERENCES "cost_models"("id") ON DELETE CASCADE ON UPDATE RESTRICT' ; + EXECUTE 'ALTER TABLE "epoch_param" DROP CONSTRAINT "epoch_param_cost_models_id_fkey"' ; + EXECUTE 'ALTER TABLE "epoch_param" ADD CONSTRAINT "epoch_param_cost_models_id_fkey" FOREIGN KEY("cost_models_id") REFERENCES "cost_models"("id") ON DELETE CASCADE ON UPDATE RESTRICT' ; + -- Hand written SQL statements can be added here. + UPDATE schema_version SET stage_two = next_version ; + RAISE NOTICE 'DB has been migrated to stage_two version %', next_version ; + END IF ; +END ; +$$ LANGUAGE plpgsql ; + +SELECT migrate() ; + +DROP FUNCTION migrate() ;