Commit Graph

1299 Commits

Author SHA1 Message Date
Heath Thomann dd45fa24a7 OPENJPA-2072: Applied Helen Xu's patch to 2.0.x
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@1341947 13f79535-47bb-0310-9956-ffa450edef68
2012-05-23 16:50:45 +00:00
Heath Thomann 9ae3d06e07 OPENJPA-2118: Provide fix to avoid possible 'division by zero' error.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@1341941 13f79535-47bb-0310-9956-ffa450edef68
2012-05-23 16:29:53 +00:00
Heath Thomann ff83975992 OPENJPA-1738: Back ported Fay's changes from trunk (2.1.x).
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@1341923 13f79535-47bb-0310-9956-ffa450edef68
2012-05-23 16:00:45 +00:00
Heath Thomann d21fb8c1a4 OPENJPA-2095: Applied Helen Xu's patch to 2.0.x
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@1341881 13f79535-47bb-0310-9956-ffa450edef68
2012-05-23 14:52:39 +00:00
Heath Thomann 4e9fd21084 OPENJPA-1974: Applied to 2.1.x Rick's changes from trunk (2.2.x)
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@1341755 13f79535-47bb-0310-9956-ffa450edef68
2012-05-23 05:58:54 +00:00
Jody Grassel f41f79360b OPENJPA-1845: the prepared query cache doesn't currently work correclty with 'SELECT IN' statements
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@1341547 13f79535-47bb-0310-9956-ffa450edef68
2012-05-22 16:04:14 +00:00
Albert Lee 117e13ed50 OPENJPA-2199 - If inverse relation is removed (nulled out) when commit, attempt to find the target type from initialized object in the state manager to complete the update graph for foreign key constraint detection between the relationships.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@1340122 13f79535-47bb-0310-9956-ffa450edef68
2012-05-18 15:08:41 +00:00
Dianne E. Richards 23f73b2adf OPENJPA-2175 Fix problem with multiple foreign keys of the same type
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@1339669 13f79535-47bb-0310-9956-ffa450edef68
2012-05-17 15:54:10 +00:00
Dianne E. Richards 8d8871e0f1 OPENJPA-2142 Fix merge of a new entity
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@1330361 13f79535-47bb-0310-9956-ffa450edef68
2012-04-25 15:49:20 +00:00
Heath Thomann b3d0ade06a OPENJPA-2117: Back-port Albert's trunk changes to 2.0.x
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@1295351 13f79535-47bb-0310-9956-ffa450edef68
2012-03-01 00:16:07 +00:00
Heath Thomann fea6083a29 OPENJPA-2051: Change to ensure entities are properly cascaded after a flush.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@1186888 13f79535-47bb-0310-9956-ffa450edef68
2011-10-20 16:27:30 +00:00
Michael Dick 1d2d1ff953 Add getDBDictionary() method to SingleEMFTestCase. Partial merge from revision 1005883
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@1159902 13f79535-47bb-0310-9956-ffa450edef68
2011-08-20 19:02:23 +00:00
Michael Dick 05d3f3051c use DROP_TABLES in IndirectRecursion testcase.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@1159901 13f79535-47bb-0310-9956-ffa450edef68
2011-08-20 19:02:15 +00:00
Michael Dick d7d14443ff Exclude TestAutoIncrement if datbase does not support auto-increment
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@1159898 13f79535-47bb-0310-9956-ffa450edef68
2011-08-20 19:02:01 +00:00
Michael Dick 82a6d093ab Exclude test on SQLServer
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@1158007 13f79535-47bb-0310-9956-ffa450edef68
2011-08-15 20:53:37 +00:00
Heath Thomann d12334e6f9 OPENJPA-1376: Backported trunk changes to 2.0.x where possible, made code gated by a system property.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@1153950 13f79535-47bb-0310-9956-ffa450edef68
2011-08-04 17:41:44 +00:00
Heath Thomann 49f14ecdeb OPENJPA-2006: If flushing, also pre-flush non-provisional entities to allow sequence ID population - merged Jeremy's changes from trunk.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@1141193 13f79535-47bb-0310-9956-ffa450edef68
2011-06-29 18:45:09 +00:00
Michael Dick a834c13739 Remove try/catch that hides exception text in TestM2MInDataCache
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@1140220 13f79535-47bb-0310-9956-ffa450edef68
2011-06-27 16:02:13 +00:00
Heath Thomann c20c89ab53 Update BrokerImpl to skip check for duplicate ids when they are auto generated - merged Rick's changes from trunk
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@1084264 13f79535-47bb-0310-9956-ffa450edef68
2011-03-22 17:39:41 +00:00
Michael Dick 9b8b19f4e1 OPENJPA-1957: treat non element collection like normal serializable types
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@1080019 13f79535-47bb-0310-9956-ffa450edef68
2011-03-09 21:59:10 +00:00
Heath Thomann 2269ea2fab OPENJPA-1911: fix merge problem for entities with derived id - merged this code from Fay's changes for trunk
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@1069924 13f79535-47bb-0310-9956-ffa450edef68
2011-02-11 19:23:29 +00:00
Jody Grassel 039abeba79 OPENJPA-1905: Validate jar-file pu element after confirming OpenJPA is chosen provider
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@1063439 13f79535-47bb-0310-9956-ffa450edef68
2011-01-25 20:21:29 +00:00
Jody Grassel d46f649e32 OPENJPA-1890: Fix NPE when an embeddable is set to a managed entity more then once, merged from Fay's changes for trunk
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@1043597 13f79535-47bb-0310-9956-ffa450edef68
2010-12-08 18:49:17 +00:00
Michael Dick 35740819fe OPENJPA-1790: Added Proxy for concurrent maps.
Submitted By: Heath Thomann, ported from Jody's patch for trunk

git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@1034584 13f79535-47bb-0310-9956-ffa450edef68
2010-11-12 22:10:12 +00:00
Michael Dick 05b6589acb OPENJPA-1874: Handle Oracle XMLType columns with @Lob annotation
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@1031710 13f79535-47bb-0310-9956-ffa450edef68
2010-11-05 18:50:08 +00:00
Donald Woods 29604c1e39 OPENJPA-1793 @EmbeddedId class having only one field java.sql.Data. Contributed by Heath Thomann.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@1027632 13f79535-47bb-0310-9956-ffa450edef68
2010-10-26 16:28:30 +00:00
Michael Dick 9f5e44d05f OPENJPA-1699: Streaming LOB support for DB2
> Submitted by Heath Thomann, based on Fay's patch for trunk

git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@1022338 13f79535-47bb-0310-9956-ffa450edef68
2010-10-14 01:08:41 +00:00
Michael Dick d8782f49ab OPENJPA-1814: JPQL fails with Group By and Having aggregate_expression IN (subquery)
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@1003209 13f79535-47bb-0310-9956-ffa450edef68
2010-09-30 19:21:25 +00:00
Michael Dick c084d03524 OPENJPA-1372: Add testcases - no mainline code changes.
Submitted By: Pinaki Poddar and Milosz Tylenda

git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@993549 13f79535-47bb-0310-9956-ffa450edef68
2010-09-07 22:24:33 +00:00
Michael Dick a787cd961a OPENJPA-1765: Add locking to TableJDBCSeq to ensure thread safety.
Submitted By: Rick Curtis

git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@993538 13f79535-47bb-0310-9956-ffa450edef68
2010-09-07 21:18:48 +00:00
Donald Woods b60ad9c5dc [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@989425 13f79535-47bb-0310-9956-ffa450edef68
2010-08-26 01:42:33 +00:00
Donald Woods 4c0a76f2d7 [maven-release-plugin] prepare release 2.0.1
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@989423 13f79535-47bb-0310-9956-ffa450edef68
2010-08-26 01:42:20 +00:00
Donald Woods c741363f8f [maven-release-plugin] rollback the release of 2.0.1
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@989380 13f79535-47bb-0310-9956-ffa450edef68
2010-08-25 21:40:13 +00:00
Donald Woods a2d8195aac [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@989333 13f79535-47bb-0310-9956-ffa450edef68
2010-08-25 20:07:05 +00:00
Donald Woods 089407d426 [maven-release-plugin] prepare release 2.0.1
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@989331 13f79535-47bb-0310-9956-ffa450edef68
2010-08-25 20:06:53 +00:00
Donald Woods 3983a156e9 [maven-release-plugin] rollback the release of 2.0.1
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@989318 13f79535-47bb-0310-9956-ffa450edef68
2010-08-25 19:37:41 +00:00
Donald Woods a248a3e865 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@989276 13f79535-47bb-0310-9956-ffa450edef68
2010-08-25 18:12:49 +00:00
Donald Woods 5f8fdfd1c6 [maven-release-plugin] prepare release 2.0.1
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@989274 13f79535-47bb-0310-9956-ffa450edef68
2010-08-25 18:12:35 +00:00
Catalina Wei f0c38d38a5 OPENJPA-1736: Mappings with foreign keys as identity fields sometimes not resolved correctly
back-out changes in 2.0.x branch.
must be pre-approved before committing changes to 2.0.x.

git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@988277 13f79535-47bb-0310-9956-ffa450edef68
2010-08-23 19:45:14 +00:00
Catalina Wei 82c9f910b5 OPENJPA-1736: Mappings with foreign keys as identity fields sometimes not resolved correctly
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@987773 13f79535-47bb-0310-9956-ffa450edef68
2010-08-21 15:46:49 +00:00
Donald Woods 5b119ab0a9 [maven-release-plugin] rollback the release of 2.0.1
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@987616 13f79535-47bb-0310-9956-ffa450edef68
2010-08-20 19:54:05 +00:00
Donald Woods 2c03991db1 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@987602 13f79535-47bb-0310-9956-ffa450edef68
2010-08-20 18:52:30 +00:00
Donald Woods b96289c695 [maven-release-plugin] prepare release 2.0.1
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@987600 13f79535-47bb-0310-9956-ffa450edef68
2010-08-20 18:52:18 +00:00
Donald Woods a3f4e2c329 [maven-release-plugin] rollback the release of 2.0.1
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@987583 13f79535-47bb-0310-9956-ffa450edef68
2010-08-20 17:25:58 +00:00
Donald Woods e69d17669b [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@987576 13f79535-47bb-0310-9956-ffa450edef68
2010-08-20 17:03:07 +00:00
Donald Woods c91b6699c7 [maven-release-plugin] prepare release 2.0.1
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@987574 13f79535-47bb-0310-9956-ffa450edef68
2010-08-20 17:02:55 +00:00
Donald Woods 0082fa48cd OPENJPA-1712 Split creation of o-p-j-test-base.jar into its own build, as jar:test-jar doesn't allow creation of 2 tests.jar in the same module and maven can't get the dependency scope right if jar:jar is used to create the artifact.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@986552 13f79535-47bb-0310-9956-ffa450edef68
2010-08-18 02:40:39 +00:00
Donald Woods 5e38145fa1 OPENJPA-1712 use project.version instead of pom.version
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@986294 13f79535-47bb-0310-9956-ffa450edef68
2010-08-17 12:30:40 +00:00
Michael Dick 4560ddf64f get lock clause from DBDictionary
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@985574 13f79535-47bb-0310-9956-ffa450edef68
2010-08-14 19:39:01 +00:00
Michael Dick 83560d0854 OPENJPA-1424: Adding testcase.
Submitted By: Heath Thomann and Daryl Stultz

git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@985343 13f79535-47bb-0310-9956-ffa450edef68
2010-08-13 20:18:48 +00:00