Author: bdaniel
Date: Mon Nov 27 13:44:23 2006
New Revision: 479774
URL: http://svn.apache.org/viewvc?view=rev&rev=479774
Log:
TUSCANY-939 Throw an exception when the JDBC driver is not providing valid
ResultSetMetaData
Modified:
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultMetadata.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ResultSetShapeTests.java
Modified:
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultMetadata.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultMetadata.java?view=diff&rev=479774&r1=479773&r2=479774
==============================================================================
---
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultMetadata.java
(original)
+++
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultMetadata.java
Mon Nov 27 13:44:23 2006
@@ -70,7 +70,10 @@
Map impliedRelationships = new HashMap();
for (int i = 1; i <= resultSetShape.getColumnCount(); i++) {
String tableName = resultSetShape.getTableName(i);
-
+ if (( tableName == null ) || ( tableName.equals(""))) {
+ throw new RuntimeException("Unable to obtain table information
from JDBC. DAS configuration must specify ResultDescriptors");
+ }
+
String typeName = configWrapper.getTableTypeName(tableName);
String columnName = resultSetShape.getColumnName(i);
Modified:
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ResultSetShapeTests.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ResultSetShapeTests.java?view=diff&rev=479774&r1=479773&r2=479774
==============================================================================
---
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ResultSetShapeTests.java
(original)
+++
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ResultSetShapeTests.java
Mon Nov 27 13:44:23 2006
@@ -79,10 +79,12 @@
Command readCustomers = das.createCommand(sqlString);
// Read
- DataObject root = readCustomers.executeQuery();
-
- // Verify
- assertNull(root.getList("invalidProperty"));
+ try {
+ readCustomers.executeQuery();
+ fail("exception not thrown");
+ } catch (RuntimeException ex) {
+ assertEquals("Unable to obtain table information from JDBC. DAS
configuration must specify ResultDescriptors", ex.getMessage());
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
