From dc529ff055daefedbcb180fe472919249e0b3fdd Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 4 Jan 2026 18:44:22 +0100 Subject: [PATCH 1/2] =?UTF-8?q?A=C3=B1adido=20documento=20composer=20para?= =?UTF-8?q?=20entorno=20plesk?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.plesk.yml | 45 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 docker-compose.plesk.yml diff --git a/docker-compose.plesk.yml b/docker-compose.plesk.yml new file mode 100644 index 0000000..587e542 --- /dev/null +++ b/docker-compose.plesk.yml @@ -0,0 +1,45 @@ +version: "3.8" + +services: + imprimelibros-db: + image: mysql:8.0 + container_name: imprimelibros-db + environment: + MYSQL_ROOT_PASSWORD: NrXz6DK6UoN + MYSQL_DATABASE: imprimelibros + MYSQL_USER: imprimelibros_user + MYSQL_PASSWORD: om91irrDctd + volumes: + - db_data:/var/lib/mysql + networks: + - imprimelibros-network + restart: always + ports: + - "3309:3306" # host:container + + imprimelibros-app: + build: + context: . + dockerfile: Dockerfile + image: imprimelibros-app:latest + container_name: imprimelibros-app + depends_on: + - imprimelibros-db + environment: + SPRING_DATASOURCE_URL: jdbc:mysql://imprimelibros-db:3306/imprimelibros?useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Europe/Madrid + SPRING_DATASOURCE_USERNAME: imprimelibros_user + SPRING_DATASOURCE_PASSWORD: om91irrDctd + ports: + - "127.0.0.1:8080:8080" + volumes: + - ./logs:/var/log/imprimelibros + restart: always + networks: + - imprimelibros-network + +volumes: + db_data: + +networks: + imprimelibros-network: + driver: bridge From 6bfc60d15878489f6de9e73ed6e68a40a6cf04c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaime=20Jim=C3=A9nez?= Date: Mon, 5 Jan 2026 11:05:26 +0100 Subject: [PATCH 2/2] modificado el baseline. actualmente falla porque hay que rellenar la tabla variables --- src/main/resources/application.properties | 4 ++-- .../db/changelog/changesets/0001-baseline.yml | 7 ++++--- .../changesets/0018-change-presupuesto-ch-3.yml | 14 ++++++++++++++ 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 7b38f23..ac999bb 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,7 +1,7 @@ spring.application.name=erp # Active profile -spring.profiles.active=dev -#spring.profiles.active=test +#spring.profiles.active=dev +spring.profiles.active=test #spring.profiles.active=prod diff --git a/src/main/resources/db/changelog/changesets/0001-baseline.yml b/src/main/resources/db/changelog/changesets/0001-baseline.yml index eae860c..e3f6aba 100644 --- a/src/main/resources/db/changelog/changesets/0001-baseline.yml +++ b/src/main/resources/db/changelog/changesets/0001-baseline.yml @@ -539,13 +539,13 @@ databaseChangeLog: - column: constraints: nullable: false - defaultValueComputed: CURRENT_TIMESTAMP(3) + defaultValueComputed: CURRENT_TIMESTAMP name: created_at type: datetime - column: constraints: nullable: false - defaultValueComputed: CURRENT_TIMESTAMP(3) on update CURRENT_TIMESTAMP(3) + defaultValueComputed: CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP name: updated_at type: datetime - column: @@ -573,6 +573,7 @@ databaseChangeLog: name: iva_reducido type: BIT(1) tableName: presupuesto + - changeSet: id: 1761213112413-10 author: jjimenez (generated) @@ -840,7 +841,7 @@ databaseChangeLog: associatedWith: '' columns: - column: - defaultValueNumeric: !!float '0' + defaultValueNumeric: 0 name: deleted indexName: idx_presupuesto_deleted tableName: presupuesto diff --git a/src/main/resources/db/changelog/changesets/0018-change-presupuesto-ch-3.yml b/src/main/resources/db/changelog/changesets/0018-change-presupuesto-ch-3.yml index 3e51bd4..15420fc 100644 --- a/src/main/resources/db/changelog/changesets/0018-change-presupuesto-ch-3.yml +++ b/src/main/resources/db/changelog/changesets/0018-change-presupuesto-ch-3.yml @@ -2,12 +2,25 @@ databaseChangeLog: - changeSet: id: 0018-change-presupuesto-ch-3 author: jjo + preConditions: + - onFail: MARK_RAN + - onError: HALT - dbms: type: mysql + - sqlCheck: + expectedResult: 1 + sql: | + SELECT CASE WHEN COUNT(*) > 0 THEN 1 ELSE 0 END + FROM information_schema.TABLE_CONSTRAINTS + WHERE CONSTRAINT_SCHEMA = DATABASE() + AND TABLE_NAME = 'presupuesto' + AND CONSTRAINT_NAME = 'presupuesto_chk_3' + AND CONSTRAINT_TYPE = 'CHECK'; changes: - sql: + dbms: mysql splitStatements: false stripComments: true sql: | @@ -16,6 +29,7 @@ databaseChangeLog: rollback: - sql: + dbms: mysql splitStatements: false stripComments: true sql: |