Author: allee8285
Date: Tue Nov 4 13:56:31 2008
New Revision: 711431
URL: http://svn.apache.org/viewvc?rev=711431&view=rev
Log:
OPENJPA-761 - test for null column object and post a more meaning message to
the warning log in SchemaGenerator.
Modified:
openjpa/branches/1.3.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaGenerator.java
openjpa/branches/1.3.x/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/schema/localizer.properties
Modified:
openjpa/branches/1.3.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaGenerator.java
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaGenerator.java?rev=711431&r1=711430&r2=711431&view=diff
==============================================================================
---
openjpa/branches/1.3.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaGenerator.java
(original)
+++
openjpa/branches/1.3.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaGenerator.java
Tue Nov 4 13:56:31 2008
@@ -791,8 +791,13 @@
if (invalids == null || !invalids.contains(fk)) {
try {
- fk.join(table.getColumn(fkColName),
- pkTable.getColumn(pkColName));
+ Column fkCol = table.getColumn(fkColName);
+ if (fkCol == null) {
+ throw new IllegalArgumentException(_loc.get(
+ "no-column", fkColName, table.getName())
+ .getMessage());
+ }
+ fk.join(fkCol, pkTable.getColumn(pkColName));
} catch (IllegalArgumentException iae) {
if (_log.isWarnEnabled())
_log.warn(_loc.get("bad-join", iae.toString()));
Modified:
openjpa/branches/1.3.x/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/schema/localizer.properties
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/schema/localizer.properties?rev=711431&r1=711430&r2=711431&view=diff
==============================================================================
---
openjpa/branches/1.3.x/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/schema/localizer.properties
(original)
+++
openjpa/branches/1.3.x/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/schema/localizer.properties
Tue Nov 4 13:56:31 2008
@@ -151,3 +151,4 @@
conn-failed: Failed to connect to DataSource. Verify Driver "{0}", URL "{1}" \
and connection properties "{2}" are correct. See the nested exception
for \
further details.
+no-column: Can not find column "{0}" in table "{1}"
