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:15 UTC
[isis-app-simpleapp] branch jpa-SNAPSHOT updated: getting JPA to
run under flyway
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch jpa-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
The following commit(s) were added to refs/heads/jpa-SNAPSHOT by this push:
new f5045d5 getting JPA to run under flyway
f5045d5 is described below
commit f5045d5c8d25b9e2054fd633639a959b860ac997
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Mar 15 09:13:42 2021 +0000
getting JPA to run under flyway
---
.../src/main/java/domainapp/modules/simple/SimpleModule.java | 2 +-
.../java/domainapp/modules/simple/dom/so/SimpleObject.java | 12 ++++++------
.../V2020.01.20.14.14__create_table_simple_SimpleObject.sql | 8 ++++----
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java b/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java
index 89c9d01..6cc1e79 100644
--- a/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java
+++ b/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java
@@ -21,7 +21,7 @@ import domainapp.modules.simple.dom.so.SimpleObject;
SimpleModule.Configuration.class,
})
@EnableJpaRepositories
-@EntityScan(basePackageClasses = {SimpleModule.class})
+@EntityScan(basePackageClasses = {SimpleObject.class})
public class SimpleModule implements ModuleWithFixtures {
@Override
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 6cb6e8a..1a86d0e 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
@@ -8,6 +8,7 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.DomainObjectLayout;
+import org.apache.isis.applib.annotation.MemberOrder;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.jaxb.PersistentEntityAdapter;
import org.apache.isis.applib.services.message.MessageService;
@@ -44,15 +45,14 @@ public class SimpleObject implements Comparable<SimpleObject> {
@javax.persistence.Id
@javax.persistence.GeneratedValue(strategy = javax.persistence.GenerationType.AUTO)
- @javax.persistence.Column(nullable = false)
- @Programmatic
- @Getter @Setter
+ @javax.persistence.Column(name = "id", nullable = false)
private Long id;
@javax.persistence.Version
- @Programmatic
- @javax.persistence.Column(name = "OPTLOCK")
- private int version;
+ @javax.persistence.Column(name = "version", nullable = false)
+ @MemberOrder(name = "Metadata", sequence = "999")
+ @Getter @Setter
+ private long version;
public static SimpleObject withName(String name) {
val simpleObject = new SimpleObject();
diff --git a/webapp/src/main/resources/db/migration/SQLSERVER/V2020.01.20.14.14__create_table_simple_SimpleObject.sql b/webapp/src/main/resources/db/migration/SQLSERVER/V2020.01.20.14.14__create_table_simple_SimpleObject.sql
index 0d727cf..66a3b83 100644
--- a/webapp/src/main/resources/db/migration/SQLSERVER/V2020.01.20.14.14__create_table_simple_SimpleObject.sql
+++ b/webapp/src/main/resources/db/migration/SQLSERVER/V2020.01.20.14.14__create_table_simple_SimpleObject.sql
@@ -5,10 +5,10 @@ SET QUOTED_IDENTIFIER ON
GO
CREATE TABLE [simple].[SimpleObject](
- [id] [bigint] IDENTITY(1,1) NOT NULL,
- [name] [varchar](40) NOT NULL,
- [notes] [varchar](4000) NULL,
- [version] [datetime2](7) NOT NULL,
+ [id] [bigint] NOT NULL,
+ [name] [varchar](40) NOT NULL,
+ [notes] [varchar](4000) NULL,
+ [version] [bigint] NOT NULL,
CONSTRAINT [SimpleObject_PK] PRIMARY KEY CLUSTERED
([id] ASC)