diff --git a/README.md b/README.md index 7332a6a..cae6cb3 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ Average Response Time: 12.37 µs ```bash docker-compose up -docker-compose exec -it app migrate +# Generate an api key docker-compose exec -it app cli --create-user=Admin ``` @@ -59,7 +59,6 @@ docker run \ -e APP_URL="http://localhost:4000" \ sjdonado/bit -docker exec -it bit migrate docker exec -it bit cli --create-user=Admin ``` @@ -83,7 +82,6 @@ dokku config:set bit DATABASE_URL="sqlite3://./sqlite/data.db?journal_mode=wal&s dokku ports:add bit http:80:4000 dokku ports:add bit https:443:4000 -dokku run bit migrate dokku run bit cli --create-user=Admin ``` @@ -261,7 +259,6 @@ brew install micrate ``` ```bash -shards run migrate shards run bit ``` diff --git a/app/lib/database.cr b/app/lib/database.cr index 2a80b65..7bcfbf0 100644 --- a/app/lib/database.cr +++ b/app/lib/database.cr @@ -1,5 +1,6 @@ require "sqlite3" require "crecto" +require"micrate" module App::Lib class Database @@ -14,5 +15,12 @@ module App::Lib if ENV["ENV"] == "development" Crecto::DbLogger.set_handler(STDOUT) end + + def self.run_migrations + Micrate::DB.connection_url = ENV["DATABASE_URL"] + Micrate::Cli.run_up + end + + run_migrations end end diff --git a/benchmark.sh b/benchmark.sh index 194fe48..255f4db 100755 --- a/benchmark.sh +++ b/benchmark.sh @@ -134,12 +134,6 @@ if [ $? -ne 0 ]; then exit 1 fi -docker-compose exec -T app migrate -if [ $? -ne 0 ]; then - echo "Failed to run database migrations." - exit 1 -fi - # Create a new user and capture the API key output=$(docker-compose exec -T app cli --create-user=Admin) api_key=$(echo "$output" | awk -F' ' '/X-Api-Key:/{print $NF}') diff --git a/scripts/migrate.cr b/scripts/migrate.cr deleted file mode 100644 index c64d19e..0000000 --- a/scripts/migrate.cr +++ /dev/null @@ -1,7 +0,0 @@ -require "sqlite3" -require"micrate" - -require "../app/config/env" - -Micrate::DB.connection_url = ENV["DATABASE_URL"] -Micrate::Cli.run_up diff --git a/shard.yml b/shard.yml index 9dbc7a5..dc8a4dd 100644 --- a/shard.yml +++ b/shard.yml @@ -9,8 +9,6 @@ targets: main: bit.cr cli: main: scripts/cli.cr - migrate: - main: scripts/migrate.cr dependencies: kemal: