Author: bdaniel
Date: Mon Dec 4 13:24:28 2006
New Revision: 482362
URL: http://svn.apache.org/viewvc?view=rev&rev=482362
Log:
The DAS will now throw an exception when a user tries to add an unqualified
primary key
using the ConfigHelper
Modified:
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/QualifiedColumn.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ProgrammaticConfigTests.java
Modified:
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/QualifiedColumn.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/QualifiedColumn.java?view=diff&rev=482362&r1=482361&r2=482362
==============================================================================
---
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/QualifiedColumn.java
(original)
+++
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/QualifiedColumn.java
Mon Dec 4 13:24:28 2006
@@ -30,8 +30,12 @@
private final Logger logger =
LoggerFactory.INSTANCE.getLogger(QualifiedColumn.class);
public QualifiedColumn(String name) {
- tableName = name.substring(0, name.indexOf('.'));
- columnName = name.substring(name.indexOf('.') + 1);
+ int index = name.indexOf('.');
+ if ( index == -1 ) {
+ throw new RuntimeException("Column " + name + " must be qualified
with a table name");
+ }
+ tableName = name.substring(0, index);
+ columnName = name.substring(index + 1);
if (this.logger.isDebugEnabled()) {
this.logger.debug("Table name: " + tableName);
Modified:
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ProgrammaticConfigTests.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ProgrammaticConfigTests.java?view=diff&rev=482362&r1=482361&r2=482362
==============================================================================
---
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ProgrammaticConfigTests.java
(original)
+++
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ProgrammaticConfigTests.java
Mon Dec 4 13:24:28 2006
@@ -323,4 +323,13 @@
assertEquals("ID NAME", widgets.getCreate().getParameters());
}
+
+ public void testAddInvalidPrimaryKey() throws Exception {
+ ConfigHelper helper = new ConfigHelper();
+ try {
+ helper.addPrimaryKey("PK");
+ } catch (RuntimeException ex) {
+ assertEquals ("Column PK must be qualified with a table name",
ex.getMessage());
+ }
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
