Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[OPENJPA-2934] ORM 3.1 offline schema is added; extendedSchema schema… #125

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+2,406 −31
Open

[OPENJPA-2934] ORM 3.1 offline schema is added; extendedSchema schema… #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dac1329
[OPENJPA-2934] ORM 3.1 offline schema is added; extendedSchema schema…
solomax Mar 9, 2025
d3aaba2
Java time tests at CI should be fixed
solomax Mar 9, 2025
a0367b4
testMaxOffsetTime should be green at CI
solomax Mar 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions openjpa-all/src/main/appended-resources/META-INF/LICENSE.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,8 @@ openjpa-persistence -
http://xmlns.jcp.org/xml/ns/persistence/orm_2_2.xsd)
orm_3_0-xsd.rsrc - Eclipse Public License v2.0 - included in the openjpa jar, taken from:
https://jakarta.ee/xml/ns/persistence/orm/orm_3_0.xsd
orm_3_1-xsd.rsrc - Eclipse Public License v2.0 - included in the openjpa jar, taken from:
https://jakarta.ee/xml/ns/persistence/orm/orm_3_1.xsd
persistence-xsd.rsrc - CDDL 1.0 - included in the openjpa jar, taken from:
http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd)
persistence_2_0-xsd.rsrc - CDDL 1.0 - included in the openjpa jar, taken from:
Expand Down
1 change: 1 addition & 0 deletions openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/XMLVersionParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ public class XMLVersionParser extends XMLMetaDataParser {
public static final String VERSION_2_1 = "2.1";
public static final String VERSION_2_2 = "2.2";
public static final String VERSION_3_0 = "3.0";
public static final String VERSION_3_1 = "3.1";

static private final String VERSION_ATTR = "version";
static private final String XSI_NS =
Expand Down
98 changes: 67 additions & 31 deletions ...sistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestJava8TimeTypes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,24 +41,37 @@ public class TestJava8TimeTypes extends SingleEMFTestCase {
private static String VAL_LOCAL_TIME = "04:57:15";
private static String VAL_LOCAL_DATETIME = "2019-01-01T01:00:00";

private Java8TimeTypes insertedEntity = new Java8TimeTypes();
private Java8TimeTypes entity1 = new Java8TimeTypes();
private Java8TimeTypes entity2 = new Java8TimeTypes();

@Override
public void setUp() {
setUp(CLEAR_TABLES, Java8TimeTypes.class);

EntityManager em = emf.createEntityManager();
em.getTransaction().begin();

insertedEntity.setId(1);
insertedEntity.setOldDateField(new Date());
insertedEntity.setLocalTimeField(LocalTime.parse(VAL_LOCAL_TIME));
insertedEntity.setLocalDateField(LocalDate.parse(VAL_LOCAL_DATE));
insertedEntity.setLocalDateTimeField(LocalDateTime.parse(VAL_LOCAL_DATETIME));
insertedEntity.setOffsetTimeField(insertedEntity.getLocalTimeField().atOffset(ZoneOffset.ofHours(-9)));
insertedEntity.setOffsetDateTimeField(insertedEntity.getLocalDateTimeField().atOffset(ZoneOffset.ofHours(-9)));

em.persist(insertedEntity);

entity1.setId(1);
entity1.setOldDateField(new Date());
entity1.setLocalTimeField(LocalTime.parse(VAL_LOCAL_TIME));
entity1.setLocalDateField(LocalDate.parse(VAL_LOCAL_DATE));
entity1.setLocalDateTimeField(LocalDateTime.parse(VAL_LOCAL_DATETIME));
entity1.setOffsetTimeField(entity1.getLocalTimeField().atOffset(ZoneOffset.ofHours(-9)));
entity1.setOffsetDateTimeField(entity1.getLocalDateTimeField().atOffset(ZoneOffset.ofHours(-9)));

em.persist(entity1);

// Second entity is created to pass testGetCurrentLocalTime test
// it still can fail in case will be started exactly at midnight
entity2.setId(2);
entity2.setOldDateField(new Date());
entity2.setLocalTimeField(LocalTime.now().minusNanos(1));
entity2.setLocalDateField(LocalDate.parse(VAL_LOCAL_DATE));
entity2.setLocalDateTimeField(LocalDateTime.parse(VAL_LOCAL_DATETIME));
entity2.setOffsetTimeField(entity2.getLocalTimeField().atOffset(ZoneOffset.ofHours(-9)));
entity2.setOffsetDateTimeField(entity2.getLocalDateTimeField().atOffset(ZoneOffset.ofHours(-9)));

em.persist(entity2);
em.getTransaction().commit();
em.close();

Expand All @@ -77,20 +90,20 @@ public void testReadJava8Types() {

// Many databases do not support WITH TIMEZONE syntax.
// Thus we can only portably ensure tha the same instant is used at least.
assertEquals(Instant.from(insertedEntity.getOffsetDateTimeField()),
assertEquals(Instant.from(entity1.getOffsetDateTimeField()),
Instant.from(eRead.getOffsetDateTimeField()));

assertEquals(insertedEntity.getOffsetTimeField().withOffsetSameInstant(eRead.getOffsetTimeField().getOffset()),
assertEquals(entity1.getOffsetTimeField().withOffsetSameInstant(eRead.getOffsetTimeField().getOffset()),
eRead.getOffsetTimeField());
em.close();
}
// we've got reports from various functions not properly working with Java8 Dates.

// we've got reports from various functions not properly working with Java8 Dates.
public void testReadLocalDate() {
EntityManager em = emf.createEntityManager();
final TypedQuery<LocalDate> qry = em.createQuery("select t.localDateField from Java8TimeTypes AS t", LocalDate.class);
final LocalDate date = qry.getSingleResult();
assertNotNull(date);
final List<LocalDate> date = qry.getResultList();
assertEquals(2, date.size());
em.close();
}

Expand All @@ -115,24 +128,35 @@ public void testMaxLocalTime() {
EntityManager em = emf.createEntityManager();
final TypedQuery<LocalTime> qry = em.createQuery("select max(t.localTimeField) from Java8TimeTypes AS t", LocalTime.class);
final LocalTime max = qry.getSingleResult();
assertEquals(LocalTime.parse(VAL_LOCAL_TIME), max);
final LocalTime etalon = (entity1.getLocalTimeField().compareTo(entity2.getLocalTimeField()) > 0
? entity1.getLocalTimeField() : entity2.getLocalTimeField()).withNano(0);
assertEquals(etalon, max);
em.close();
}

public void testMaxOffsetTime() {
EntityManager em = emf.createEntityManager();
final TypedQuery<OffsetTime> qry = em.createQuery("select max(t.offsetTimeField) from Java8TimeTypes AS t", OffsetTime.class);
final OffsetTime max = qry.getSingleResult();
assertEquals(insertedEntity.getOffsetTimeField().withOffsetSameInstant(insertedEntity.getOffsetTimeField().getOffset()),
max.withOffsetSameInstant(insertedEntity.getOffsetTimeField().getOffset()));

// ---from DBDictionary
// adjust to the default timezone right now.
// This is an ugly hack and cries for troubles in case the daylight saving changes...
// Which is also the reason why we cannot cache the offset.
// According to the Oracle docs the JDBC driver always assumes 'local time' ...
final ZoneOffset zoneOffset = OffsetDateTime.now().getOffset();
final OffsetTime offset1 = entity1.getOffsetTimeField().withOffsetSameInstant(zoneOffset);
final OffsetTime offset2 = entity2.getOffsetTimeField().withOffsetSameInstant(zoneOffset);
final OffsetTime etalon = (offset1.compareTo(offset2) > 0) ? offset1 : offset2;
assertEquals(etalon.withNano(0), max);
em.close();
}

public void testMaxOffsetDateTime() {
EntityManager em = emf.createEntityManager();
final TypedQuery<OffsetDateTime> qry = em.createQuery("select max(t.offsetDateTimeField) from Java8TimeTypes AS t", OffsetDateTime.class);
final OffsetDateTime max = qry.getSingleResult();
assertEquals(Instant.from(insertedEntity.getOffsetDateTimeField()),
assertEquals(Instant.from(entity1.getOffsetDateTimeField()),
Instant.from(max));
em.close();
}
Expand All @@ -157,16 +181,27 @@ public void testMinLocalTime() {
EntityManager em = emf.createEntityManager();
final TypedQuery<LocalTime> qry = em.createQuery("select min(t.localTimeField) from Java8TimeTypes AS t", LocalTime.class);
final LocalTime min = qry.getSingleResult();
assertEquals(LocalTime.parse(VAL_LOCAL_TIME), min);
final LocalTime etalon = (entity1.getLocalTimeField().compareTo(entity2.getLocalTimeField()) < 0
? entity1.getLocalTimeField() : entity2.getLocalTimeField()).withNano(0);
assertEquals(etalon, min);
em.close();
}

public void testMinOffsetTime() {
EntityManager em = emf.createEntityManager();
final TypedQuery<OffsetTime> qry = em.createQuery("select min(t.offsetTimeField) from Java8TimeTypes AS t", OffsetTime.class);
final OffsetTime min = qry.getSingleResult();
assertEquals(insertedEntity.getOffsetTimeField().withOffsetSameInstant(insertedEntity.getOffsetTimeField().getOffset()),
min.withOffsetSameInstant(insertedEntity.getOffsetTimeField().getOffset()));

// ---from DBDictionary
// adjust to the default timezone right now.
// This is an ugly hack and cries for troubles in case the daylight saving changes...
// Which is also the reason why we cannot cache the offset.
// According to the Oracle docs the JDBC driver always assumes 'local time' ...
final ZoneOffset zoneOffset = OffsetDateTime.now().getOffset();
final OffsetTime offset1 = entity1.getOffsetTimeField().withOffsetSameInstant(zoneOffset);
final OffsetTime offset2 = entity2.getOffsetTimeField().withOffsetSameInstant(zoneOffset);
final OffsetTime etalon = (offset1.compareTo(offset2) < 0) ? offset1 : offset2;
assertEquals(etalon.withNano(0), min);
em.close();
}

Expand All @@ -175,7 +210,7 @@ public void testMinOffsetDateTime() {
final TypedQuery<OffsetDateTime> qry
= em.createQuery("select min(t.offsetDateTimeField) from Java8TimeTypes AS t", OffsetDateTime.class);
final OffsetDateTime min = qry.getSingleResult();
assertEquals(Instant.from(insertedEntity.getOffsetDateTimeField()),
assertEquals(Instant.from(entity1.getOffsetDateTimeField()),
Instant.from(min));
em.close();
}
Expand All @@ -186,16 +221,17 @@ public void testCurrentDateLocalDate() {
= em.createQuery("select j from Java8TimeTypes AS j where j.localDateField < CURRENT_DATE", Java8TimeTypes.class);
final List<Java8TimeTypes> times = qry.getResultList();
assertNotNull(times);
assertTrue(!times.isEmpty());
assertFalse(times.isEmpty());
em.close();
}

public void testCurrentDateLocalDateTime() {
EntityManager em = emf.createEntityManager();
final TypedQuery<Java8TimeTypes> qry
= em.createQuery("select j from Java8TimeTypes AS j where j.localDateTimeField < CURRENT_TIMESTAMP", Java8TimeTypes.class);
final List<Java8TimeTypes> times = qry.getResultList();
assertNotNull(times);
assertTrue(!times.isEmpty());
assertFalse(times.isEmpty());
em.close();
}

Expand All @@ -205,17 +241,17 @@ public void testGetCurrentLocalDate() {
= em.createQuery("select j from Java8TimeTypes AS j where j.localDateField < LOCAL DATE", Java8TimeTypes.class);
final List<Java8TimeTypes> times = qry.getResultList();
assertNotNull(times);
assertTrue(!times.isEmpty());
assertFalse(times.isEmpty());
em.close();
}

public void testGetCurrentLocalDateTime() {
EntityManager em = emf.createEntityManager();
final TypedQuery<Java8TimeTypes> qry
= em.createQuery("select j from Java8TimeTypes AS j where j.localDateTimeField < LOCAL DATETIME", Java8TimeTypes.class);
= em.createQuery("select j from Java8TimeTypes AS j where j.localDateTimeField < LOCAL DATETIME", Java8TimeTypes.class);
final List<Java8TimeTypes> times = qry.getResultList();
assertNotNull(times);
assertTrue(!times.isEmpty());
assertFalse(times.isEmpty());
em.close();
}

Expand All @@ -225,7 +261,7 @@ public void testGetCurrentLocalTime() {
= em.createQuery("select j from Java8TimeTypes AS j where j.localTimeField < LOCAL TIME", Java8TimeTypes.class);
final List<Java8TimeTypes> times = qry.getResultList();
assertNotNull(times);
assertTrue(!times.isEmpty());
assertFalse(times.isEmpty());
em.close();
}

Expand Down
2 changes: 2 additions & 0 deletions openjpa-persistence/src/main/appended-resources/META-INF/LICENSE.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ openjpa-persistence -
http://xmlns.jcp.org/xml/ns/persistence/orm_2_2.xsd)
orm_3_0-xsd.rsrc - Eclipse Public License v2.0 - included in the openjpa jar, taken from:
https://jakarta.ee/xml/ns/persistence/orm/orm_3_0.xsd
orm_3_1-xsd.rsrc - Eclipse Public License v2.0 - included in the openjpa jar, taken from:
https://jakarta.ee/xml/ns/persistence/orm/orm_3_1.xsd
persistence-xsd.rsrc - CDDL 1.0 - included in the openjpa jar, taken from:
http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd)
persistence_2_0-xsd.rsrc - CDDL 1.0 - included in the openjpa jar, taken from:
Expand Down
5 changes: 5 additions & 0 deletions ...ersistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,6 +594,11 @@ protected Object getSchemaSource() {
} else if (XMLVersionParser.VERSION_3_0.equals(_ormVersion)
|| (_schemaLocation != null && _schemaLocation.indexOf(ORM_XSD_3_0) > -1)) {
ormxsd = "orm_3_0-xsd.rsrc";
useExtendedSchema = false;
} else if (XMLVersionParser.VERSION_3_1.equals(_ormVersion)
|| (_schemaLocation != null && _schemaLocation.indexOf(ORM_XSD_3_0) > -1)) {
ormxsd = "orm_3_1-xsd.rsrc";
useExtendedSchema = false;
}

List<InputStream> schema = new ArrayList<>();
Expand Down
Loading