Commit Graph

193 Commits

Author SHA1 Message Date
Michael Dick 7fd119e840 updating trunk version
git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@526476 13f79535-47bb-0310-9956-ffa450edef68
2007-04-07 19:54:18 +00:00
Patrick Linskey 840644fcc5 OPENJPA-182. Changed JDBCFetchPlan.setIsolation() to use enums; added logic to handle enum hints to QueryImpl; moved from IllegalArgumentException to InvalidArgumentException to unify exception processing for both queries and find calls.
git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@526316 13f79535-47bb-0310-9956-ffa450edef68
2007-04-06 23:22:06 +00:00
Patrick Linskey bd93bfa284 OPENJPA-182. forUpdateClause is now used even if forUpdate is false, to allow for read-only optimizations. Changed JDBCFetchPlan.setIsolationLevel and JDBCFetchConfiguration.setIsolationLevel to just JDBCFetchXXX.setIsolation.
git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@526266 13f79535-47bb-0310-9956-ffa450edef68
2007-04-06 19:50:53 +00:00
Patrick Linskey 8ece757233 OPENJPA-182
git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@526212 13f79535-47bb-0310-9956-ffa450edef68
2007-04-06 16:08:27 +00:00
A. Abram White 1c8f82b810 Move LockManager API back to using int timeouts, since that's the way they're
handled elsewhere (FetchConfiguration, Broker, etc). Only use the lock timeout
on a forUpdate query if it is greater than the configured query timeout. 
Selects that are made *only* to lock a row (rather than to query data, with 
locking as a side effect) still use the lock timeout exclusively, ignoring the 
query timeout.



git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@526192 13f79535-47bb-0310-9956-ffa450edef68
2007-04-06 15:08:39 +00:00
Srinivasa Segu c5d82a70d5 OPENJPA-203. Fix select-for-update queries to timeout after the LockTimeout interval
git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@526059 13f79535-47bb-0310-9956-ffa450edef68
2007-04-06 05:21:35 +00:00
Patrick Linskey 7f998f10f1 Null check.
git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@525999 13f79535-47bb-0310-9956-ffa450edef68
2007-04-05 23:13:33 +00:00
Patrick Linskey 814637ca6c OPENJPA-182. Moved to API-based model. Query.setHint() can still be used via the query hint => fetch plan binding.
Removed the logic to override the forUpdate value, since the calling code already incorporates fetch configuration data into its decision about how to invoke toSelect(). Added a test case to assert this behavior.

Also cleaned up some minor whitespace issues, and reduced code duplication by moving a couple of concepts up into DBDictionary. Removed some seemingly-unnecessary overrides from H2Dictionary.

Added a test case for isolation level configuration. For non-DB2 dictionaries, it asserts that an exception is thrown during execution. Someone with DB2 knowledge / access should fill in the test case for the DB2 cases. As we add support for per-query isolation level configuration for other databases, we should change this test case.

git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@525997 13f79535-47bb-0310-9956-ffa450edef68
2007-04-05 22:55:52 +00:00
Srinivasa Segu e541936463 OPENJPA-203.
git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@525950 13f79535-47bb-0310-9956-ffa450edef68
2007-04-05 20:06:24 +00:00
A. Abram White 80f7795fef Cleanup bugfix relating to use of a default schema declared in orm.xml:
- Removed prepending of schema name in PersistenceMappingDefaults.getTableName
  methods as unnecessary.
- Moved storage of default schema name to ClassMappingInfo as that's the only
  place we use it for now.
- Moved setting of default schema name into the more efficient endClassMapping
  method of XMLPersistenceMappingParser.
- Fixed MappingInfo.createTable logic to pass the full table name to 
  SchemaGroup.findTable.  This is important b/c the DynamicSchemaGroup (used
  during the mappingtool's buildSchema action, the default for JPA) dynamically
  adds the table to itself during the findTable operation.  Without the full
  table name it would always add the table to the default schema.



git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@525606 13f79535-47bb-0310-9956-ffa450edef68
2007-04-04 21:13:19 +00:00
David J. Wisneski db2a53ff2d removing unneeded method in OPENJPA-182 fix
git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@525602 13f79535-47bb-0310-9956-ffa450edef68
2007-04-04 21:02:51 +00:00
Patrick Linskey 7bd43ff2e0 OPENJPA-184: handle the case where dict is null in SQLExceptions by moving the logic into DB2Dictionary.newStoreException().
git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@525583 13f79535-47bb-0310-9956-ffa450edef68
2007-04-04 19:17:11 +00:00
David J. Wisneski 5d18f26c10 fixing little formatting for OPENJPA-184
git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@525573 13f79535-47bb-0310-9956-ffa450edef68
2007-04-04 18:48:03 +00:00
David J. Wisneski 729c7af474 changes for OPENJPA-184.Appending DB2Diagnosable information to the exception.No logging done.
git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@525572 13f79535-47bb-0310-9956-ffa450edef68
2007-04-04 18:45:40 +00:00
David J. Wisneski 6fe50aa433 fix to OPENJPA-182 commit
git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@525262 13f79535-47bb-0310-9956-ffa450edef68
2007-04-03 20:24:39 +00:00
Craig Russell 4754f0921c Fixed autoboxing issue
git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@525258 13f79535-47bb-0310-9956-ffa450edef68
2007-04-03 20:02:07 +00:00
David J. Wisneski 9e8e265d6c changes for JIRA OPENJPA-182
git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@525252 13f79535-47bb-0310-9956-ffa450edef68
2007-04-03 19:34:59 +00:00
Patrick Linskey 9c25f9bdf5 Minor formatting changes.
git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@525213 13f79535-47bb-0310-9956-ffa450edef68
2007-04-03 17:20:01 +00:00
Marc Prud'hommeaux 24538f5431 Added missing 'join-bad-col-name' localized string.
git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@525029 13f79535-47bb-0310-9956-ffa450edef68
2007-04-03 04:46:24 +00:00
Michael Dick f023f58562 OpenJPA-179 store defaultSchemaName in ClassMapping
git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@525006 13f79535-47bb-0310-9956-ffa450edef68
2007-04-03 02:48:10 +00:00
A. Abram White 1679c05c89 Cleanup and fixes to changes for OPENJPA-168.
git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@523425 13f79535-47bb-0310-9956-ffa450edef68
2007-03-28 17:43:35 +00:00
David J. Wisneski fee930886b fixing indentation and few changes suggested by Abe for OpenJPA patch-168
git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@523071 13f79535-47bb-0310-9956-ffa450edef68
2007-03-27 20:47:21 +00:00
A. Abram White 9b61ded11b Simplify breaking up long IN clauses into multiple OR'd IN clauses based on the
dictionary's IN clause limit



git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@522600 13f79535-47bb-0310-9956-ffa450edef68
2007-03-26 19:17:10 +00:00
David J. Wisneski 442c1cee48 Patch for OPENJPA-168
git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@522581 13f79535-47bb-0310-9956-ffa450edef68
2007-03-26 17:59:03 +00:00
Srinivasa Segu ae2d8685e1 OPENJPA-175. PagingResultObjectProvider to use FetchBatchSize when set for eager selects. Fix to handle Oracle in-clause limit of 1000
git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@521443 13f79535-47bb-0310-9956-ffa450edef68
2007-03-22 20:26:18 +00:00
David J. Wisneski d35bc8a306 fix for OPENJPA-22
git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@516624 13f79535-47bb-0310-9956-ffa450edef68
2007-03-10 00:34:09 +00:00
Patrick Linskey 1af233a0b3 OPENJPA-80: MySQL escape string for string matches queries
git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@515043 13f79535-47bb-0310-9956-ffa450edef68
2007-03-06 09:33:06 +00:00
A. Abram White afce8f543a OPENJPA-162 : Allow explicit @OrderBy(<primary key field>).
git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@514847 13f79535-47bb-0310-9956-ffa450edef68
2007-03-05 20:14:02 +00:00
A. Abram White 4bf637f074 Improve error checks for mapped-by mappings. Mark deleted instances as
eligible for state restore on rollback so they don't always clear.  Always
cascade attach to embedded instances.



git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@512350 13f79535-47bb-0310-9956-ffa450edef68
2007-02-27 18:14:45 +00:00
Kevin W. Sutter 5ae6e7594f These changes are reverting the changes integrated for revisions 510336 and 510281. From the remarks on the dev mailing list, the basic idea is sound, we just need to re-visit the implementation a bit.
One "problem" that I couldn't resolve with this revert process was to restore the svn history for the DB2Dictionary.java part.  Somehow, the history for this part was lost when revision 510336 was integrated.  I have not found a means of restoring that history.  But, at least the contents are back to a known state.

git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@512327 13f79535-47bb-0310-9956-ffa450edef68
2007-02-27 17:23:27 +00:00
Patrick Linskey 7db81e3d6c OPENJPA-158 -- reduced log level to TRACE for a variety of enhancement and metadata related messages
git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@512107 13f79535-47bb-0310-9956-ffa450edef68
2007-02-27 01:59:42 +00:00
Srinivasa Segu 2a95f80f44 OPENJPA-151.
git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@511998 13f79535-47bb-0310-9956-ffa450edef68
2007-02-26 20:46:03 +00:00
David J. Wisneski 7eb91d0ec9 DB2 Optimize for clause enhancement
git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@510336 13f79535-47bb-0310-9956-ffa450edef68
2007-02-22 01:03:06 +00:00
David J. Wisneski 2d3871b86b DB2 Optimize for clause enhancement
git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@510281 13f79535-47bb-0310-9956-ffa450edef68
2007-02-21 22:50:04 +00:00
Srinivasa Segu 82a62a6b78 OPENJPA-157. Fix to use the getIndependentTypeMappings to handle the case of field's declared type being abstract/unmapped
git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@509885 13f79535-47bb-0310-9956-ffa450edef68
2007-02-21 04:06:45 +00:00
A. Abram White 1b446958f5 OPENJPA-146 : When copying an OID superclass field for re-mapping, revert type
to PC.  It will re-resolve to OID on its own when the field's metadata is
resolved, and in the meantime it will ensure we use the same path for 
metadata resolution as non-copied fields.



git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@509632 13f79535-47bb-0310-9956-ffa450edef68
2007-02-20 16:33:54 +00:00
Srinivasa Segu 4f102a7c77 Capturing reference to the Column[] at the creation time in the RowImpl instead of the Table, to work with DynamicSchemaFactory where the Table's columns can get modified after the creation of the RowImpl before the flush.
git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@509473 13f79535-47bb-0310-9956-ffa450edef68
2007-02-20 08:59:10 +00:00
A. Abram White a2be03e9cb Add a DiscriminatorStrategy.hasClassConditions() method rather than having the
DiscriminatorStrategy.getClassConditions() method return null for no conditions
so that we can detect whether the joins to the base class owning the 
discriminator are necessary before making them.  Otherwise, we run the risk of
creating table aliases for base class tables without joining them, which can
result in bad SQL. 



git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@505017 13f79535-47bb-0310-9956-ffa450edef68
2007-02-08 19:36:33 +00:00
A. Abram White 8d288589c2 git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@503744 13f79535-47bb-0310-9956-ffa450edef68 2007-02-05 16:01:09 +00:00
Patrick Linskey 0b60936d33 OPENJPA-37
git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@502374 13f79535-47bb-0310-9956-ffa450edef68
2007-02-01 22:03:31 +00:00
Srinivasa Segu 45d90fd282 Fixes to parse and use SqlResultSetMapping, SqlResultSetMappings annotations.
git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@498850 13f79535-47bb-0310-9956-ffa450edef68
2007-01-22 23:33:08 +00:00
A. Abram White fd0e25dae6 Expand Column.isCompatible method parameters to also take type name and
decimal digits so that DynamicSchemaFactory can set this information when
building up its internal schema representation.



git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@497866 13f79535-47bb-0310-9956-ffa450edef68
2007-01-19 16:33:08 +00:00
Marc Prud'hommeaux 6b78680b27 Fixed bug where mod operator wouldn't get inserted (for databases that support the % mod operator).
git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@497715 13f79535-47bb-0310-9956-ffa450edef68
2007-01-19 06:32:42 +00:00
Marc Prud'hommeaux b37a0f0ecf Fixed incorrect quoting of parameters in trim functions.
git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@497701 13f79535-47bb-0310-9956-ffa450edef68
2007-01-19 04:21:13 +00:00
Marc Prud'hommeaux 7f2613e394 Work around Oracle's inability to call PreparedStatement.setNull(index, Types.OTHER). We will instead used PreparedStatement.setNull(index, Types.NULL).
git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@497683 13f79535-47bb-0310-9956-ffa450edef68
2007-01-19 02:09:53 +00:00
David J. Wisneski 396efa6ae6 Support native queries making stored procedure calls, or insert, update, delete.
For native queries returning ResultSet should use getResultList or getSingleResult interfaces on Query.
For native queries performing updates without returning any results use executeUpdate interface on Query.

git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@497605 13f79535-47bb-0310-9956-ffa450edef68
2007-01-18 22:21:08 +00:00
Marc Prud'hommeaux fa5eb3a7af Changed SQL generated by JPQL query "null <> null" from "NULL IS NOT NULL" to "1 <> 1", since some databases (e.g., DB2) dislike "NULL IS NOT NULL", but everyone is OK with "1 <> 1".
git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@497279 13f79535-47bb-0310-9956-ffa450edef68
2007-01-18 01:30:45 +00:00
Marc Prud'hommeaux f0be9e1af1 Changed SQL generated by JPQL query "null = null" from "NULL IS NULL" to "1 = 1", since some databases (e.g., DB2) dislike "NULL IS NULL", but everyone is OK with "1 = 1".
git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@497276 13f79535-47bb-0310-9956-ffa450edef68
2007-01-18 01:26:57 +00:00
Marc Prud'hommeaux ef67680a55 Fixed concatinate function to cast both sides as a VARCHAR, since DB2 and Derby disallow parameters on both sides of the function.
git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@497190 13f79535-47bb-0310-9956-ffa450edef68
2007-01-17 21:48:27 +00:00
Pinaki Poddar 8303c81419 Processing <unique-constraint> in XML descriptor and serializing the same.
Does not cover <unique-constraint> within Secondary or Join table.


git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@496522 13f79535-47bb-0310-9956-ffa450edef68
2007-01-15 22:39:14 +00:00