Skip to content

Commit a7c7007

Browse files
authored
Merge pull request #184 from grillazz/178-update-shakespeare-models-with-latest-version-of-sqlacodegen
refresh alembic migrations
2 parents c7775c7 + 488dd46 commit a7c7007

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ RUN apt-get purge -y curl git build-essential \
2929

3030
FROM install AS app-image
3131

32-
ENV PYTHONPATH=/home/code/ PYTHONHASHSEED=0
32+
ENV PYTHONPATH=/home/code/ PYTHONHASHSEED=0 PYTHONASYNCIODEBUG=1
3333

3434
COPY tests/ tests/
3535
COPY app/ app/

Makefile

+8-8
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ docker-create-db-migration: ## Create new alembic database migration aka databa
2727

2828
.PHONY: docker-test
2929
docker-test: ## Run project tests
30-
docker compose -f compose.yml -f test-compose.yml run --rm app pytest tests --durations=0
30+
docker compose -f compose.yml -f test-compose.yml run --rm app pytest tests --durations=0 -vv
3131

3232
.PHONY: docker-test-snapshot
3333
docker-test-snapshot: ## Run project tests with inline snapshot
@@ -51,16 +51,16 @@ slim-build: ## with power of docker-slim build smaller and safer images
5151

5252
.PHONY: docker-feed-database
5353
docker-feed-database: ## create database objects and insert data
54-
docker compose exec db psql devdb user -f /home/gx/code/shakespeare_work.sql | true
55-
docker compose exec db psql devdb user -f /home/gx/code/shakespeare_chapter.sql | true
56-
docker compose exec db psql devdb user -f /home/gx/code/shakespeare_wordform.sql | true
57-
docker compose exec db psql devdb user -f /home/gx/code/shakespeare_character.sql | true
58-
docker compose exec db psql devdb user -f /home/gx/code/shakespeare_paragraph.sql | true
59-
docker compose exec db psql devdb user -f /home/gx/code/shakespeare_character_work.sql
54+
docker compose exec db psql devdb devdb -f /home/gx/code/shakespeare_work.sql | true
55+
docker compose exec db psql devdb devdb -f /home/gx/code/shakespeare_chapter.sql | true
56+
docker compose exec db psql devdb devdb -f /home/gx/code/shakespeare_wordform.sql | true
57+
docker compose exec db psql devdb devdb -f /home/gx/code/shakespeare_character.sql | true
58+
docker compose exec db psql devdb devdb -f /home/gx/code/shakespeare_paragraph.sql | true
59+
docker compose exec db psql devdb devdb -f /home/gx/code/shakespeare_character_work.sql
6060

6161
.PHONY: model-generate
6262
model-generate: ## generate sqlalchemy models from database
63-
poetry run sqlacodegen --generator declarative postgresql://user:secret@0.0.0.0/devdb --outfile models.py --schemas shakespeare
63+
poetry run sqlacodegen --generator declarative postgresql://devdb:secret@0.0.0.0/devdb --outfile models.py --schemas shakespeare --options nobidi
6464

6565
.PHONY: docker-up-granian
6666
docker-up-granian: ## Run project with compose and granian

alembic/versions/20240102_2012_68cd4c3a0af0_.py renamed to alembic/versions/20241122_1212_0c69050b5a3e_init.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
"""
1+
"""init
22
3-
Revision ID: 68cd4c3a0af0
3+
Revision ID: 0c69050b5a3e
44
Revises:
5-
Create Date: 2024-01-02 20:12:46.214651
5+
Create Date: 2024-11-22 12:12:12.343675
66
77
"""
88

99
from alembic import op
1010
import sqlalchemy as sa
11-
11+
from sqlalchemy.dialects import postgresql
1212

1313
# revision identifiers, used by Alembic.
14-
revision = "68cd4c3a0af0"
14+
revision = "0c69050b5a3e"
1515
down_revision = None
1616
branch_labels = None
1717
depends_on = None

0 commit comments

Comments
 (0)