From d6e7fb62e94b2b8e8bacae4b45fe079c1f505625 Mon Sep 17 00:00:00 2001 From: Prad N Date: Thu, 29 May 2025 16:54:49 -0400 Subject: [PATCH] refactor: streamline migration process and fix table naming --- .github/setup_env.sh | 3 +- .../migrations/002_credentials_table.down.sql | 2 +- internal/migrations/006_prices_table.down.sql | 1 + internal/migrations/011_health_table.down.sql | 33 +---------- internal/migrations/Taskfile.yml | 59 ++++++++++--------- 5 files changed, 35 insertions(+), 63 deletions(-) diff --git a/.github/setup_env.sh b/.github/setup_env.sh index 2eb141e..c103313 100644 --- a/.github/setup_env.sh +++ b/.github/setup_env.sh @@ -10,7 +10,7 @@ export ROOT_DIR=$(git rev-parse --show-toplevel) export RADAR_ROOT=$ROOT_DIR/cmd/radar export WORKER_ROOT=$ROOT_DIR/cmd/worker export SQLC_ROOT=$ROOT_DIR/internal/db -export MIGRATE_ROOT=$ROOT_DIR/internal/migrate +export MIGRATE_ROOT=$ROOT_DIR/internal/migrations # Setup Build Outputs export RADAR_OUT=$RADAR_ROOT/build/app.wasm @@ -106,3 +106,4 @@ function publish_release() { goreleaser release --clean } +# alias task='task --silent -c $ROOT_DIR/.taskfile.dist.yml' diff --git a/internal/migrations/002_credentials_table.down.sql b/internal/migrations/002_credentials_table.down.sql index ff412a9..f2c7ab3 100644 --- a/internal/migrations/002_credentials_table.down.sql +++ b/internal/migrations/002_credentials_table.down.sql @@ -1 +1 @@ -DROP TABLE credential; +DROP TABLE credentials; diff --git a/internal/migrations/006_prices_table.down.sql b/internal/migrations/006_prices_table.down.sql index e69de29..3bc3a94 100644 --- a/internal/migrations/006_prices_table.down.sql +++ b/internal/migrations/006_prices_table.down.sql @@ -0,0 +1 @@ +DROP TABLE prices; diff --git a/internal/migrations/011_health_table.down.sql b/internal/migrations/011_health_table.down.sql index 50d5757..7f234e7 100644 --- a/internal/migrations/011_health_table.down.sql +++ b/internal/migrations/011_health_table.down.sql @@ -1,32 +1 @@ - --- Activity table for basic transaction broadcast activity -CREATE TABLE activities ( - id TEXT PRIMARY KEY, - created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, - updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, - deleted_at TIMESTAMP, - account_id TEXT NOT NULL, - tx_hash TEXT, - tx_type TEXT NOT NULL, - status TEXT NOT NULL, - amount TEXT, - fee TEXT, - gas_used INTEGER, - gas_wanted INTEGER, - memo TEXT, - block_height INTEGER, - timestamp TIMESTAMP NOT NULL, - raw_log TEXT, - error TEXT, - FOREIGN KEY (account_id) REFERENCES accounts(id) -); - -CREATE INDEX idx_activities_account_id ON activities(account_id); -CREATE INDEX idx_activities_tx_hash ON activities(tx_hash); -CREATE INDEX idx_activities_tx_type ON activities(tx_type); -CREATE INDEX idx_activities_status ON activities(status); -CREATE INDEX idx_activities_timestamp ON activities(timestamp); -CREATE INDEX idx_activities_block_height ON activities(block_height); -CREATE INDEX idx_activities_deleted_at ON activities(deleted_at); - - +DROP TABLE health; diff --git a/internal/migrations/Taskfile.yml b/internal/migrations/Taskfile.yml index 0280ae6..979f707 100644 --- a/internal/migrations/Taskfile.yml +++ b/internal/migrations/Taskfile.yml @@ -4,7 +4,8 @@ silent: true tasks: default: - cmd: task -l --json | jq -r '.tasks[].name' | fzf | xargs task + cmds: + - task: migrate initialize: cmds: @@ -49,10 +50,10 @@ tasks: - task: migrate:accounts:up migrate:accounts:up: - cmd: wrangler d1 execute USERS_DB --file 001_accounts_table.up.sql --remote + cmd: wrangler d1 execute USERS_DB --file 001_accounts_table.up.sql --remote -y migrate:accounts:down: - cmd: wrangler d1 execute USERS_DB --file 001_accounts_table.down.sql --remote + cmd: wrangler d1 execute USERS_DB --file 001_accounts_table.down.sql --remote -y migrate:credentials: cmds: @@ -60,10 +61,10 @@ tasks: - task: migrate:credentials:up migrate:credentials:up: - cmd: wrangler d1 execute USERS_DB --file 002_credentials_table.up.sql --remote + cmd: wrangler d1 execute USERS_DB --file 002_credentials_table.up.sql --remote -y migrate:credentials:down: - cmd: wrangler d1 execute USERS_DB --file 002_credentials_table.down.sql --remote + cmd: wrangler d1 execute USERS_DB --file 002_credentials_table.down.sql --remote -y migrate:profiles: cmds: @@ -71,10 +72,10 @@ tasks: - task: migrate:profiles:up migrate:profiles:up: - cmd: wrangler d1 execute USERS_DB --file 003_profiles_table.up.sql --remote + cmd: wrangler d1 execute USERS_DB --file 003_profiles_table.up.sql --remote -y migrate:profiles:down: - cmd: wrangler d1 execute USERS_DB --file 003_profiles_table.down.sql --remote + cmd: wrangler d1 execute USERS_DB --file 003_profiles_table.down.sql --remote -y migrate:vaults: cmds: @@ -82,10 +83,10 @@ tasks: - task: migrate:vaults:up migrate:vaults:down: - cmd: wrangler d1 execute USERS_DB --file 004_vaults_table.down.sql --remote + cmd: wrangler d1 execute USERS_DB --file 004_vaults_table.down.sql --remote -y migrate:vaults:up: - cmd: wrangler d1 execute USERS_DB --file 004_vaults_table.up.sql --remote + cmd: wrangler d1 execute USERS_DB --file 004_vaults_table.up.sql --remote -y migrate:assets: cmds: @@ -93,10 +94,10 @@ tasks: - task: migrate:assets:up migrate:assets:up: - cmd: wrangler d1 execute NETWORK_DB --file 005_assets_table.up.sql --remote + cmd: wrangler d1 execute NETWORK_DB --file 005_assets_table.up.sql --remote -y migrate:assets:down: - cmd: wrangler d1 execute NETWORK_DB --file 005_assets_table.down.sql --remote + cmd: wrangler d1 execute NETWORK_DB --file 005_assets_table.down.sql --remote -y migrate:prices: cmds: @@ -104,10 +105,10 @@ tasks: - task: migrate:prices:up migrate:prices:up: - cmd: wrangler d1 execute NETWORK_DB --file 006_prices_table.up.sql --remote + cmd: wrangler d1 execute NETWORK_DB --file 006_prices_table.up.sql --remote -y migrate:prices:down: - cmd: wrangler d1 execute NETWORK_DB --file 006_prices_table.down.sql --remote + cmd: wrangler d1 execute NETWORK_DB --file 006_prices_table.down.sql --remote -y migrate:price_conversions: cmds: @@ -115,10 +116,10 @@ tasks: - task: migrate:price_conversions:up migrate:price_conversions:up: - cmd: wrangler d1 execute NETWORK_DB --file 007_price_conversions_table.up.sql --remote + cmd: wrangler d1 execute NETWORK_DB --file 007_price_conversions_table.up.sql --remote -y migrate:price_conversions:down: - cmd: wrangler d1 execute NETWORK_DB --file 007_price_conversions_table.down.sql --remote + cmd: wrangler d1 execute NETWORK_DB --file 007_price_conversions_table.down.sql --remote -y migrate:blockchains: cmds: @@ -126,10 +127,10 @@ tasks: - task: migrate:blockchains:up migrate:blockchains:up: - cmd: wrangler d1 execute NETWORK_DB --file 008_blockchains_table.up.sql --remote + cmd: wrangler d1 execute NETWORK_DB --file 008_blockchains_table.up.sql --remote -y migrate:blockchains:down: - cmd: wrangler d1 execute NETWORK_DB --file 008_blockchains_table.down.sql --remote + cmd: wrangler d1 execute NETWORK_DB --file 008_blockchains_table.down.sql --remote -y migrate:services: cmds: @@ -137,10 +138,10 @@ tasks: - task: migrate:services:up migrate:services:up: - cmd: wrangler d1 execute ACTIVITY_DB --file 009_services_table.up.sql --remote + cmd: wrangler d1 execute ACTIVITY_DB --file 009_services_table.up.sql --remote -y migrate:services:down: - cmd: wrangler d1 execute ACTIVITY_DB --file 009_services_table.down.sql --remote + cmd: wrangler d1 execute ACTIVITY_DB --file 009_services_table.down.sql --remote -y migrate:activities: cmds: @@ -148,10 +149,10 @@ tasks: - task: migrate:activities:up migrate:activities:up: - cmd: wrangler d1 execute ACTIVITY_DB --file 010_activities_table.up.sql --remote + cmd: wrangler d1 execute ACTIVITY_DB --file 010_activities_table.up.sql --remote -y migrate:activities:down: - cmd: wrangler d1 execute ACTIVITY_DB --file 010_activities_table.down.sql --remote + cmd: wrangler d1 execute ACTIVITY_DB --file 010_activities_table.down.sql --remote -y migrate:health: cmds: @@ -159,10 +160,10 @@ tasks: - task: migrate:health:up migrate:health:up: - cmd: wrangler d1 execute ACTIVITY_DB --file 011_health_table.up.sql --remote + cmd: wrangler d1 execute ACTIVITY_DB --file 011_health_table.up.sql --remote -y migrate:health:down: - cmd: wrangler d1 execute ACTIVITY_DB --file 011_health_table.down.sql --remote + cmd: wrangler d1 execute ACTIVITY_DB --file 011_health_table.down.sql --remote -y migrate:global_market: cmds: @@ -170,10 +171,10 @@ tasks: - task: global_market:up migrate:global_market:up: - cmd: wrangler d1 execute ACTIVITY_DB --file 012_global_market_table.up.sql --remote + cmd: wrangler d1 execute ACTIVITY_DB --file 012_global_market_table.up.sql --remote -y migrate:global_market:down: - cmd: wrangler d1 execute ACTIVITY_DB --file 012_global_market_table.down.sql --remote + cmd: wrangler d1 execute ACTIVITY_DB --file 012_global_market_table.down.sql --remote -y migrate:fear_greed_index: cmds: @@ -181,10 +182,10 @@ tasks: - task: migrate:fear_greed_index:up migrate:fear_greed_index:up: - cmd: wrangler d1 execute ACTIVITY_DB --file 013_fear_greed_index_table.up.sql --remote + cmd: wrangler d1 execute ACTIVITY_DB --file 013_fear_greed_index_table.up.sql --remote -y migrate:fear_greed_index:down: - cmd: wrangler d1 execute ACTIVITY_DB --file 013_fear_greed_index_table.down.sql --remote + cmd: wrangler d1 execute ACTIVITY_DB --file 013_fear_greed_index_table.down.sql --remote -y migrate:crypto_listings: cmds: @@ -192,8 +193,8 @@ tasks: - task: migrate:crypto_listings:up migrate:crypto_listings:up: - cmd: wrangler d1 execute ACTIVITY_DB --file 014_crypto_listings_table.up.sql --remote + cmd: wrangler d1 execute ACTIVITY_DB --file 014_crypto_listings_table.up.sql --remote -y migrate:crypto_listings:down: - cmd: wrangler d1 execute ACTIVITY_DB --file 014_crypto_listings_table.down.sql --remote + cmd: wrangler d1 execute ACTIVITY_DB --file 014_crypto_listings_table.down.sql --remote -y