Author: kwilliams
Date: Thu Jul 27 15:56:58 2006
New Revision: 426309
URL: http://svn.apache.org/viewvc?rev=426309&view=rev
Log:
Applying Brent's patch for TUSCANY-584
Modified:
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Statement.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CorrectedDefectTests.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DatabaseSetup.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/MySQLSetup.java
incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMappingWithInvalidCUD.xml
Modified:
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Statement.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Statement.java?rev=426309&r1=426308&r2=426309&view=diff
==============================================================================
---
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Statement.java
(original)
+++
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Statement.java
Thu Jul 27 15:56:58 2006
@@ -141,8 +141,12 @@
DebugUtil.debugln(getClass(), debug, "Setting parameter " +
param.getIndex() + " to " + value);
if (value == null) {
if (param.getType() == null) {
- ParameterMetaData pmd = ps.getParameterMetaData();
- ps.setNull(param.getIndex(),
pmd.getParameterType(param.getIndex()));
+ try {
+ ParameterMetaData pmd =
ps.getParameterMetaData();
+ ps.setNull(param.getIndex(),
pmd.getParameterType(param.getIndex()));
+ } catch (Exception ex) {
+ ps.setNull(param.getIndex(),
SDODataTypeHelper.sqlTypeFor(null));
+ }
} else
ps.setNull(param.getIndex(),
SDODataTypeHelper.sqlTypeFor(param.getType()));
} else {
Modified:
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CorrectedDefectTests.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CorrectedDefectTests.java?rev=426309&r1=426308&r2=426309&view=diff
==============================================================================
---
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CorrectedDefectTests.java
(original)
+++
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CorrectedDefectTests.java
Thu Jul 27 15:56:58 2006
@@ -111,7 +111,7 @@
insert.execute();
// Verify
- Command select = das.createCommand("Select * from
conmgt.serverstatus");
+ Command select = das.createCommand("Select * from
conmgt.SERVERSTATUS");
DataObject root = select.executeQuery();
assertEquals(1, root.getList("SERVERSTATUS").size());
Modified:
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DatabaseSetup.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DatabaseSetup.java?rev=426309&r1=426308&r2=426309&view=diff
==============================================================================
---
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DatabaseSetup.java
(original)
+++
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DatabaseSetup.java
Thu Jul 27 15:56:58 2006
@@ -56,8 +56,14 @@
connection.setAutoCommit(false);
} catch (Exception e) {
- if (e instanceof SQLException)
- ((SQLException) e).getNextException().printStackTrace();
+ if (e instanceof SQLException) {
+ if ( ((SQLException) e).getNextException() != null )
+ ((SQLException) e).getNextException().printStackTrace();
+ else
+ e.printStackTrace();
+
+ }
+
throw new RuntimeException(e);
}
@@ -106,7 +112,8 @@
s.execute(statements[i]);
} catch (SQLException e) {
// If the table does not exist then ignore the exception on
drop
- if (!e.getMessage().contains("does not exist"))
+ if ((!e.getMessage().contains("does not exist")) &&
+ (!e.getMessage().contains("Unknown table")))
throw new RuntimeException(e);
}
}
Modified:
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/MySQLSetup.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/MySQLSetup.java?rev=426309&r1=426308&r2=426309&view=diff
==============================================================================
---
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/MySQLSetup.java
(original)
+++
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/MySQLSetup.java
Thu Jul 27 15:56:58 2006
@@ -47,12 +47,12 @@
" DELETE FROM CUSTOMER WHERE ID = theId ";
-// String createGetNamedCustomers =
-// "CREATE PROCEDURE `dastest`.`GETNAMEDCUSTOMERS`(IN
thename VARCHAR(30), OUT theCount INTEGER ) " +
-// " BEGIN " +
-// " SELECT * FROM CUSTOMER AS CUSTOMER WHERE LASTNAME =
theName; " +
-// " SET theCount = (SELECT COUNT(*) FROM CUSTOMER WHERE LASTNAME
= theName); " +
-// " END ";
+ String createGetNamedCustomers =
+ "CREATE PROCEDURE `dastest`.`GETNAMEDCUSTOMERS`(IN
thename VARCHAR(30), OUT theCount INTEGER ) " +
+ " BEGIN " +
+ " SELECT * FROM CUSTOMER AS CUSTOMER WHERE LASTNAME =
theName; " +
+ " SET theCount = (SELECT COUNT(*) FROM CUSTOMER WHERE LASTNAME =
theName); " +
+ " END ";
String createGetCustomerAndOrders =
" CREATE PROCEDURE `dastest`.`GETCUSTOMERANDORDERS`
(theId INT) " +
@@ -70,8 +70,8 @@
s.execute(createDeleteCustomer);
s.execute(createGetNamedCompany);
s.execute(createGetCustomerAndOrders);
-// s.execute(createGetNamedCustomers);
-//TODO - add this back after DB2 problem is resolved
+ s.execute(createGetNamedCustomers);
+
} catch (SQLException e) {
throw new RuntimeException(e);
}
@@ -79,8 +79,8 @@
//Overrides for table creation
- protected String getCreateCompany() {
- return "CREATE TABLE COMPANY (ID INT PRIMARY KEY NOT NULL
AUTO_INCREMENT, NAME VARCHAR(30))";
+ protected String getCreateCompany() {
+ return "CREATE TABLE COMPANY (ID INT PRIMARY KEY NOT NULL
AUTO_INCREMENT, NAME VARCHAR(30), EOTMID INT)";
}
protected String getCreateEmployee() {
return "CREATE TABLE EMPLOYEE (ID INT PRIMARY KEY NOT NULL
AUTO_INCREMENT, NAME VARCHAR(30), SN VARCHAR(10), MANAGER SMALLINT,
DEPARTMENTID INT)";
@@ -90,6 +90,10 @@
}
protected String getCreateTypeTest() {
return "CREATE TABLE TYPETEST (ID INT PRIMARY KEY NOT NULL,
ATIMESTAMP DATETIME, ADECIMAL DECIMAL(9,2), AFLOAT FLOAT)";
+ }
+
+ protected String getCreateServerStatus() {
+ return "CREATE TABLE CONMGT.SERVERSTATUS (STATUSID INT PRIMARY
KEY NOT NULL AUTO_INCREMENT, MANAGEDSERVERID INTEGER NOT NULL, TIMESTAMP
TIMESTAMP NOT NULL)";
}
}
Modified:
incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMappingWithInvalidCUD.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMappingWithInvalidCUD.xml?rev=426309&r1=426308&r2=426309&view=diff
==============================================================================
---
incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMappingWithInvalidCUD.xml
(original)
+++
incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMappingWithInvalidCUD.xml
Thu Jul 27 15:56:58 2006
@@ -17,9 +17,9 @@
<Config
xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
<Table tableName="CUSTOMER">
- <create sql="insert into customer blah values (?, ?, ?)"
parameters="ID LASTNAME ADDRESS"/>
- <update sql="update customer blah set lastname = ?, address = ? where
ID = ?" parameters="LASTNAME ADDRESS ID"/>
- <delete sql="delete from customer blah where ID = ?" parameters="ID"/>
+ <create sql="isnert into customer blah values (?, ?, ?)"
parameters="ID LASTNAME ADDRESS"/>
+ <update sql="udpate customer blah set lastname = ?, address = ? where
ID = ?" parameters="LASTNAME ADDRESS ID"/>
+ <delete sql="dleete from customer blah where ID = ?" parameters="ID"/>
<Column columnName="ID" primaryKey="true"/>
<Column columnName="LASTNAME"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
