You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by bd...@apache.org on 2006/11/20 23:08:22 UTC
svn commit: r477361 - in
/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework:
MySQLSetup.java TestData.java
Author: bdaniel
Date: Mon Nov 20 14:08:21 2006
New Revision: 477361
URL: http://svn.apache.org/viewvc?view=rev&rev=477361
Log:
Some updates to the MySQL test suite
Modified:
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/MySQLSetup.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/TestData.java
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?view=diff&rev=477361&r1=477360&r2=477361
==============================================================================
--- 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 Mon Nov 20 14:08:21 2006
@@ -56,6 +56,9 @@
String createGetNamedCompany = " CREATE PROCEDURE `dastest`.`GETNAMEDCOMPANY` (theName VARCHAR(100)) "
+ " SELECT * FROM COMPANY WHERE NAME = theName";
+ String createCustomersAndOrders = "CREATE PROCEDURE `dastest`.`GETALLCUSTOMERSANDORDERS` () "
+ + " BEGIN SELECT * FROM CUSTOMER; SELECT * FROM ANORDER; END;";
+
System.out.println("Creating procedures");
try {
@@ -64,6 +67,7 @@
s.execute(createGetNamedCompany);
s.execute(createGetCustomerAndOrders);
s.execute(createGetNamedCustomers);
+ s.execute(createCustomersAndOrders);
} catch (SQLException e) {
throw new RuntimeException(e);
@@ -80,10 +84,10 @@
+ "SN VARCHAR(10), MANAGER SMALLINT, DEPARTMENTID INT)";
}
- protected String getCreateDepartment() {
- return "CREATE TABLE DEPARTMENT (ID INT PRIMARY KEY NOT NULL AUTO_INCREMENT, NAME VARCHAR(30), "
- + "LOCATION VARCHAR(30), NUMBER VARCHAR(10), COMPANYID INT, EOTM INT)";
- }
+// protected String getCreateDepartment() {
+// return "CREATE TABLE DEPARTMENT (ID INT PRIMARY KEY NOT NULL AUTO_INCREMENT, NAME VARCHAR(30), "
+// + "LOCATION VARCHAR(30), DEPNUMBER VARCHAR(10), COMPANYID INT, EOTM INT)";
+// }
protected String getCreateTypeTest() {
return "CREATE TABLE TYPETEST (ID INT PRIMARY KEY NOT NULL, ATIMESTAMP DATETIME, ADECIMAL DECIMAL(9,2), "
@@ -93,6 +97,9 @@
protected String getCreateServerStatus() {
return "CREATE TABLE CONMGT.SERVERSTATUS (STATUSID INT PRIMARY KEY NOT NULL AUTO_INCREMENT, "
+ "MANAGEDSERVERID INTEGER NOT NULL, TIMESTAMP TIMESTAMP NOT NULL)";
+ }
+ protected String getGeneratedKeyClause() {
+ return "AUTO_INCREMENT";
}
}
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/TestData.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/TestData.java?view=diff&rev=477361&r1=477360&r2=477361
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/TestData.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/TestData.java Mon Nov 20 14:08:21 2006
@@ -109,7 +109,7 @@
protected static Date getDate(String timeStamp) {
try {
- return DATE_FORMAT.parse("1966-12-20 00:00:00.0");
+ return DATE_FORMAT.parse(timeStamp);
} catch (ParseException e) {
throw new RuntimeException(e);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org