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/03/15 09:15:42 UTC
[isis-app-simpleapp] branch jdo updated: fixes up flyway for JDO
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch jdo
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
The following commit(s) were added to refs/heads/jdo by this push:
new 4262c65 fixes up flyway for JDO
4262c65 is described below
commit 4262c65a4f5cf4f1b325ca1ea07b5461565a45f0
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Mar 15 09:10:38 2021 +0000
fixes up flyway for JDO
---
.../modules/simple/dom/so/SimpleObject.java | 2 +-
webapp/src/main/resources/application.yml | 5 -----
.../config/application-SQLSERVER.properties | 23 ++++++++--------------
.../main/resources/config/application.properties | 8 +++++++-
4 files changed, 16 insertions(+), 22 deletions(-)
diff --git a/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java b/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java
index ff0b6d5..4050df5 100644
--- a/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java
+++ b/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java
@@ -29,7 +29,7 @@ import lombok.Setter;
import lombok.ToString;
import lombok.val;
-@javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE, schema = "simple")
+@javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE, schema = "SIMPLE")
@javax.jdo.annotations.DatastoreIdentity(strategy=IdGeneratorStrategy.IDENTITY, column="id")
@javax.jdo.annotations.Queries({
@javax.jdo.annotations.Query(
diff --git a/webapp/src/main/resources/application.yml b/webapp/src/main/resources/application.yml
index 01820c7..3f7a592 100644
--- a/webapp/src/main/resources/application.yml
+++ b/webapp/src/main/resources/application.yml
@@ -67,11 +67,6 @@ isis:
show-drop-down-on-footer: true
- persistence:
- schema:
- auto-create-schemas: simple
- create-schema-sql-template: "CREATE SCHEMA IF NOT EXISTS %S"
-
# note that properties under 'datanucleus' must use camelCase rather than kebab-case
datanucleus:
schema:
diff --git a/webapp/src/main/resources/config/application-SQLSERVER.properties b/webapp/src/main/resources/config/application-SQLSERVER.properties
index ae61e11..026330e 100644
--- a/webapp/src/main/resources/config/application-SQLSERVER.properties
+++ b/webapp/src/main/resources/config/application-SQLSERVER.properties
@@ -15,26 +15,19 @@
# Prereq is an empty database called 'simpleapp', with user and password also 'simpleapp'
#
-# note that properties under 'isis.persistence.jdo-datanucleus.impl' are passed through directly
-# to DataNucleus, and must use camelCase rather than kebab-case
+spring.flyway.enabled=true
+spring.flyway.default-schema=SIMPLE
+spring.flyway.schemas=SIMPLE
+spring.datasource.platform=sqlserver
spring.datasource.url=jdbc:sqlserver://localhost;databaseName=simpleapp
+spring.datasource.driver-class-name=com.microsoft.sqlserver.jdbc.SQLServerDriver
spring.datasource.username=simpleapp
spring.datasource.password=simpleapp
-spring.datasource.driver-class-name=com.microsoft.sqlserver.jdbc.SQLServerDriver
-
-#javax.jdo.option.ConnectionURL=jdbc:sqlserver://localhost;databaseName=simpleapp
-#javax.jdo.option.ConnectionDriverName=com.microsoft.sqlserver.jdbc.SQLServerDriver
-#javax.jdo.option.ConnectionUserName=simpleapp
-#javax.jdo.option.ConnectionPassword=simpleapp
-
-datanucleus.schema.autoCreateAll=false
+#isis.persistence.schema.create-schema-sql-template= (use flyway instead)
isis.persistence.schema.auto-create-schemas=
-spring.flyway.enabled=true
-
-#spring.flyway.url=${javax.jdo.option.ConnectionURL}
-#spring.flyway.user=${javax.jdo.option.ConnectionUserName}
-#spring.flyway.password=${javax.jdo.option.ConnectionPassword}
+# DataNucleus, and must use camelCase rather than kebab-case
+datanucleus.schema.autoCreateAll=false
diff --git a/webapp/src/main/resources/config/application.properties b/webapp/src/main/resources/config/application.properties
index 304765d..36b43d9 100644
--- a/webapp/src/main/resources/config/application.properties
+++ b/webapp/src/main/resources/config/application.properties
@@ -8,10 +8,16 @@
#
+spring.flyway.enabled=false
+
spring.datasource.platform=h2
spring.datasource.url=jdbc:h2:mem:simple
+spring.datasource.driver-class-name=org.h2.Driver
-spring.flyway.enabled=false
+isis.persistence.schema.create-schema-sql-template=CREATE SCHEMA IF NOT EXISTS %S
+isis.persistence.schema.auto-create-schemas=SIMPLE
+
+datanucleus.schema.autoCreateTables=true
# uncomment to run during bootstrap
#isis.testing.fixtures.initial-script = domainapp.webapp.application.fixture.scenarios.DomainAppDemo