You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2021/09/29 06:25:47 UTC
[isis-app-demo] 07/23: changes config files for schema change
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/isis-app-demo.git
commit 24e9a090f0e1add19a855f912e2a76a756af5189
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Sep 29 06:57:15 2021 +0100
changes config files for schema change
---
module-pets-tests/src/test/resources/application-test.yml | 2 +-
webapp-tests/src/test/resources/application-test.yml | 2 +-
.../src/main/resources/config/application-SQLSERVER.properties | 10 +++++-----
webapp/src/main/resources/config/application.properties | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/module-pets-tests/src/test/resources/application-test.yml b/module-pets-tests/src/test/resources/application-test.yml
index 3a68cae..fa32cda 100644
--- a/module-pets-tests/src/test/resources/application-test.yml
+++ b/module-pets-tests/src/test/resources/application-test.yml
@@ -1,4 +1,4 @@
isis:
persistence:
schema:
- auto-create-schemas: "simple"
+ auto-create-schemas: "pets"
diff --git a/webapp-tests/src/test/resources/application-test.yml b/webapp-tests/src/test/resources/application-test.yml
index 3a68cae..fa32cda 100644
--- a/webapp-tests/src/test/resources/application-test.yml
+++ b/webapp-tests/src/test/resources/application-test.yml
@@ -1,4 +1,4 @@
isis:
persistence:
schema:
- auto-create-schemas: "simple"
+ auto-create-schemas: "pets"
diff --git a/webapp/src/main/resources/config/application-SQLSERVER.properties b/webapp/src/main/resources/config/application-SQLSERVER.properties
index 07d8fe3..561b8a4 100644
--- a/webapp/src/main/resources/config/application-SQLSERVER.properties
+++ b/webapp/src/main/resources/config/application-SQLSERVER.properties
@@ -16,14 +16,14 @@
#
spring.flyway.enabled=true
-spring.flyway.default-schema=SIMPLE
-spring.flyway.schemas=SIMPLE
+spring.flyway.default-schema=PETS
+spring.flyway.schemas=PETS
spring.datasource.platform=sqlserver
-spring.datasource.url=jdbc:sqlserver://localhost;databaseName=simpleapp
+spring.datasource.url=jdbc:sqlserver://localhost;databaseName=petclinic
spring.datasource.driver-class-name=com.microsoft.sqlserver.jdbc.SQLServerDriver
-spring.datasource.username=simpleapp
-spring.datasource.password=simpleapp
+spring.datasource.username=petclinic
+spring.datasource.password=petclinic
#isis.persistence.schema.create-schema-sql-template= (use flyway instead)
isis.persistence.schema.auto-create-schemas=
diff --git a/webapp/src/main/resources/config/application.properties b/webapp/src/main/resources/config/application.properties
index 8a7dcce..87d3d0f 100644
--- a/webapp/src/main/resources/config/application.properties
+++ b/webapp/src/main/resources/config/application.properties
@@ -15,7 +15,7 @@ spring.datasource.url=jdbc:h2:mem:simple;DATABASE_TO_UPPER=false
spring.datasource.driver-class-name=org.h2.Driver
isis.persistence.schema.create-schema-sql-template=CREATE SCHEMA IF NOT EXISTS %s
-isis.persistence.schema.auto-create-schemas=simple
+isis.persistence.schema.auto-create-schemas=pets
#eclipselink.weaving=true
eclipselink.deploy-on-startup=true