From c31f1bb59d8de45c6b97223695b64ea03175f785 Mon Sep 17 00:00:00 2001 From: Kobe Date: Mon, 9 Jun 2025 13:01:51 +0200 Subject: [PATCH] fix migration... again... --- __pycache__/models.cpython-313.pyc | Bin 37330 -> 37357 bytes docker-compose.yml | 4 +- migrations/versions/fix_updated_at_trigger.py | 45 ++++++++++++++++++ models.py | 2 +- routes/__pycache__/main.cpython-313.pyc | Bin 85748 -> 85748 bytes start.sh | 6 --- 6 files changed, 49 insertions(+), 8 deletions(-) create mode 100644 migrations/versions/fix_updated_at_trigger.py diff --git a/__pycache__/models.cpython-313.pyc b/__pycache__/models.cpython-313.pyc index ce6d3ac90418b32ad6cc266eb28a556ae3c45caf..bda7478b3242fe5358e8f1d6807430252b51f8d2 100644 GIT binary patch delta 154 zcmcb#nCb0eCf?7yyj%=GV7SjMBYPw7jP}VFayc2pHm`4&VdfMtWdzAFFif71B*_cs z1q)fSOuo@IgHMyWNE#?xv=^wXXy@b&5zd?Mce^t31OoYO3^zpN8+;#3UZ^NCIkQM` va%k@#g`~^w$rthpuIH6r$}9cAz);TU#q^nhA)nEk=_3P!kk96*z6xdlqe3tD delta 137 zcmaF6nCa4DCf?7yyj%=GaB#9)M#4tk8SPx`ATAJmHrc$sU51%g$dnNx5G-iPJo#7G z4E-uy=g^=aSHF<>5Kmv%;1EaO00n7k%2+TadT;31v3C(H7I8Q diff --git a/docker-compose.yml b/docker-compose.yml index 481cf2d..79c8358 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,8 +7,10 @@ networks: services: web: build: - context: https://git.kobeamerijckx.com/Kobe/docupulse.git + context: . dockerfile: Dockerfile + # context: https://git.kobeamerijckx.com/Kobe/docupulse.git + # dockerfile: Dockerfile ports: - "${PORT:-10335}:5000" environment: diff --git a/migrations/versions/fix_updated_at_trigger.py b/migrations/versions/fix_updated_at_trigger.py new file mode 100644 index 0000000..db687f9 --- /dev/null +++ b/migrations/versions/fix_updated_at_trigger.py @@ -0,0 +1,45 @@ +"""fix updated_at trigger + +Revision ID: fix_updated_at_trigger +Revises: add_status_details +Create Date: 2024-03-19 12:00:00.000000 + +""" +from alembic import op +import sqlalchemy as sa +from sqlalchemy import text + +# revision identifiers, used by Alembic. +revision = 'fix_updated_at_trigger' +down_revision = 'add_status_details' +branch_labels = None +depends_on = None + +def upgrade(): + # Drop the existing trigger if it exists + op.execute("DROP TRIGGER IF EXISTS update_instances_updated_at ON instances") + op.execute("DROP FUNCTION IF EXISTS update_updated_at_column()") + + # Create the trigger function + op.execute(""" + CREATE OR REPLACE FUNCTION update_updated_at_column() + RETURNS TRIGGER AS $$ + BEGIN + NEW.updated_at = CURRENT_TIMESTAMP; + RETURN NEW; + END; + $$ language 'plpgsql'; + """) + + # Create the trigger + op.execute(""" + CREATE TRIGGER update_instances_updated_at + BEFORE UPDATE ON instances + FOR EACH ROW + EXECUTE FUNCTION update_updated_at_column(); + """) + +def downgrade(): + # Drop the trigger and function + op.execute("DROP TRIGGER IF EXISTS update_instances_updated_at ON instances") + op.execute("DROP FUNCTION IF EXISTS update_updated_at_column()") \ No newline at end of file diff --git a/models.py b/models.py index 0aac28c..727f100 100644 --- a/models.py +++ b/models.py @@ -509,7 +509,7 @@ class Instance(db.Model): status = db.Column(db.String(20), nullable=False, default='inactive') status_details = db.Column(db.Text, nullable=True) created_at = db.Column(db.DateTime, nullable=False, server_default=db.text('CURRENT_TIMESTAMP')) - updated_at = db.Column(db.DateTime, nullable=False, server_default=db.text('CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP')) + updated_at = db.Column(db.DateTime, nullable=False, server_default=db.text('CURRENT_TIMESTAMP'), onupdate=db.text('CURRENT_TIMESTAMP')) def __repr__(self): return f'' \ No newline at end of file diff --git a/routes/__pycache__/main.cpython-313.pyc b/routes/__pycache__/main.cpython-313.pyc index adf63b143e404ccfaee7c42cdc6e99554f88e949..53844d3312253e5c0bea45c10544c3f739f9ed42 100644 GIT binary patch delta 28 icmew|m-WkBR=&@?yj%=G@O_tChKN8T-&Q`xXMO;Y@CjT1 delta 28 icmew|m-WkBR=&@?yj%=GpgGGe<2+|0-&Q`xXMO;TRS6;h diff --git a/start.sh b/start.sh index ce8d60b..38c3be0 100644 --- a/start.sh +++ b/start.sh @@ -6,12 +6,6 @@ while ! nc -z db 5432; do done echo "Database is ready!" -echo "Waiting for Redis..." -while ! nc -z redis 6379; do - sleep 0.1 -done -echo "Redis is ready!" - echo "Running database migrations..." flask db upgrade