Tidy up migrations

Author: elffjs

cmd/contract-event-processor/main.go

@@ -29,7 +29,13 @@ func main() {
 		switch subCommand := os.Args[1]; subCommand {
 		case "migrate":
 			command := "up"
-			services.MigrateDatabase(logger, &settings, command, "chain_indexer")
+			if len(os.Args) > 2 {
+				command = os.Args[2]
+				if command == "down-to" || command == "up-to" {
+					command = command + " " + os.Args[3]
+				}
+			}
+			migrateDatabase(logger, &settings, command)
 			return
 		case "override":
 			if len(os.Args) > 2 {

internal/services/migrate.go renamed to cmd/contract-event-processor/migrate.go

@@ -1,20 +1,17 @@
-package services
+package main
 
 import (
 	"database/sql"
-	"fmt"
 
 	"github.com/DIMO-Network/contract-event-processor/internal/config"
-	"github.com/pressly/goose/v3"
+	"github.com/pressly/goose"
 	"github.com/rs/zerolog"
-
-	_ "github.com/lib/pq"
 )
 
-func MigrateDatabase(logger zerolog.Logger, s *config.Settings, command, schemaName string) {
+func migrateDatabase(logger zerolog.Logger, settings *config.Settings, command string) {
 	var db *sql.DB
 	// setup database
-	db, err := sql.Open("postgres", s.DB.BuildConnectionString(true))
+	db, err := sql.Open("postgres", settings.DB.BuildConnectionString(true))
 	defer func() {
 		if err := db.Close(); err != nil {
 			logger.Fatal().Msgf("goose: failed to close DB: %v\n", err)
@@ -23,23 +20,20 @@ func MigrateDatabase(logger zerolog.Logger, s *config.Settings, command, schemaN
 	if err != nil {
 		logger.Fatal().Msgf("failed to open db connection: %v\n", err)
 	}
-
 	if err = db.Ping(); err != nil {
 		logger.Fatal().Msgf("failed to ping db: %v\n", err)
 	}
-
 	// set default
 	if command == "" {
 		command = "up"
 	}
-	// must create schema so that can set migrations table to that schema
-	_, err = db.Exec(fmt.Sprintf("CREATE SCHEMA IF NOT EXISTS %s;", schemaName))
+	// todo manually run sql to create devices_api schema
+	_, err = db.Exec("CREATE SCHEMA IF NOT EXISTS contract_event_processor;")
 	if err != nil {
-		logger.Fatal().Err(err).Msgf("could not create schema, %s", schemaName)
+		logger.Fatal().Err(err).Msg("could not create schema")
 	}
-	goose.SetTableName(fmt.Sprintf("%s.migrations", schemaName))
+	goose.SetTableName("contract_event_processor.migrations")
 	if err := goose.Run(command, db, "migrations"); err != nil {
 		logger.Fatal().Msgf("failed to apply go code migrations: %v\n", err)
 	}
-	// if we add any code migrations import _ "github.com/DIMO-Network/users-api/migrations" // migrations won't work without this
 }

go.mod

@@ -76,6 +76,7 @@ require (
 	github.com/go-ole/go-ole v1.2.1 // indirect
 	github.com/go-stack/stack v1.8.0 // indirect
 	github.com/gorilla/websocket v1.4.2 // indirect
+	github.com/pressly/goose v2.7.0+incompatible
 	github.com/rs/zerolog v1.28.0
 	github.com/segmentio/ksuid v1.0.4
 	github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible // indirect

go.sum

@@ -473,6 +473,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
 github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s=
+github.com/pressly/goose v2.7.0+incompatible h1:PWejVEv07LCerQEzMMeAtjuyCKbyprZ/LBa6K5P0OCQ=
+github.com/pressly/goose v2.7.0+incompatible/go.mod h1:m+QHWCqxR3k8D9l7qfzuC/djtlfzxr34mozWDYEu1z8=
 github.com/pressly/goose/v3 v3.7.0 h1:jblaZul15uCIEKHRu5KUdA+5wDA7E60JC0TOthdrtf8=
 github.com/pressly/goose/v3 v3.7.0/go.mod h1:N5gqPdIzdxf3BiPWdmoPreIwHStkxsvKWE5xjUvfYNk=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=

migrations/1_create_schema.sql renamed to migrations/00001_create_schema.sql

@@ -1,17 +1,11 @@
 -- +goose Up
 -- +goose StatementBegin
-SELECT 'up SQL query';
-
 REVOKE CREATE ON schema public FROM public; -- public schema isolation
 CREATE SCHEMA IF NOT EXISTS contract_event_processor;
-
 -- +goose StatementEnd
 
 -- +goose Down
 -- +goose StatementBegin
-SELECT 'down SQL query';
-
-DROP SCHEMA chain_indexer CASCADE;
+DROP SCHEMA contract_event_processor CASCADE;
 GRANT CREATE, USAGE ON schema public TO public;
-
 -- +goose StatementEnd

migrations/2_blocks.sql renamed to migrations/00002_blocks.sql

@@ -1,13 +1,13 @@
 -- +goose Up
 -- +goose StatementBegin
-SELECT 'up SQL query';
-
-SET search_path TO contract_event_processor;
+SET search_path TO contract_event_processor, public;
 
 CREATE TABLE IF NOT EXISTS blocks (
-    hash bytea PRIMARY KEY,
-    number bigint NOT NULL,
-    processed_at timestamp default (now() at time zone 'utc')
+    number bigint PRIMARY KEY
+        CONSTRAINT blocks_number_check CHECK (number > 0),
+    hash bytea
+        CONSTRAINT blocks_hash_check CHECK (length(hash) = 32),
+    processed_at timestamptz default current_timestamp
 );
 
 ALTER TABLE blocks
@@ -20,9 +20,7 @@ on blocks (number);
 
 -- +goose Down
 -- +goose StatementBegin
-SELECT 'down SQL query';
-
-SET search_path TO contract_event_processor;
+SET search_path TO contract_event_processor, public;
 
 DROP TABLE IF EXISTS blocks;