You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by sa...@apache.org on 2015/07/27 19:36:12 UTC
ode git commit: ODE-1034: Fixes for some failing testcases
Repository: ode
Updated Branches:
refs/heads/ode-1.3.x b22801c13 -> e3b4d2f2d
ODE-1034: Fixes for some failing testcases
Project: http://git-wip-us.apache.org/repos/asf/ode/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/e3b4d2f2
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/e3b4d2f2
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/e3b4d2f2
Branch: refs/heads/ode-1.3.x
Commit: e3b4d2f2d9c61760dec4e6b83d871b7dca33285f
Parents: b22801c
Author: sathwik <sa...@apache.org>
Authored: Mon Jul 27 23:05:54 2015 +0530
Committer: sathwik <sa...@apache.org>
Committed: Mon Jul 27 23:05:54 2015 +0530
----------------------------------------------------------------------
dao-hibernate-db/src/main/sql/simplesched-hsql.sql | 6 +++---
.../java/org/apache/ode/dao/jpa/test/InsertObjectTest.java | 3 +++
.../java/org/apache/ode/dao/jpa/test/SelectObjectTest.java | 3 +++
.../java/org/apache/ode/scheduler/simple/DelegateSupport.java | 2 +-
scheduler-simple/src/test/resources/simplesched-hsql.sql | 6 +++---
5 files changed, 13 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode/blob/e3b4d2f2/dao-hibernate-db/src/main/sql/simplesched-hsql.sql
----------------------------------------------------------------------
diff --git a/dao-hibernate-db/src/main/sql/simplesched-hsql.sql b/dao-hibernate-db/src/main/sql/simplesched-hsql.sql
index ac6e2c4..39860a9 100644
--- a/dao-hibernate-db/src/main/sql/simplesched-hsql.sql
+++ b/dao-hibernate-db/src/main/sql/simplesched-hsql.sql
@@ -5,9 +5,9 @@
--
CREATE TABLE ode_job (
- jobid CHAR(64) NOT NULL DEFAULT '',
+ jobid varchar(64) NOT NULL DEFAULT '',
ts BIGINT NOT NULL DEFAULT 0,
- nodeid char(64),
+ nodeid varchar(64),
scheduled int NOT NULL DEFAULT 0,
transacted int NOT NULL DEFAULT 0,
@@ -20,7 +20,7 @@ CREATE TABLE ode_job (
correlationKeySet varchar(255),
retryCount int,
inMem int,
- detailsExt binary(4096),
+ detailsExt blob(4096),
PRIMARY KEY(jobid));
http://git-wip-us.apache.org/repos/asf/ode/blob/e3b4d2f2/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/InsertObjectTest.java
----------------------------------------------------------------------
diff --git a/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/InsertObjectTest.java b/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/InsertObjectTest.java
index 2552abd..3850820 100644
--- a/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/InsertObjectTest.java
+++ b/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/InsertObjectTest.java
@@ -66,6 +66,9 @@ public class InsertObjectTest extends TestCase {
hsqlds.setDatabase("jdbc:hsqldb:mem:" + new GUID().toString());
hsqlds.setUser("sa");
hsqlds.setPassword("");
+ Properties prop = new Properties();
+ prop.setProperty("sql.enforce_size", "false");
+ hsqlds.setProperties(prop);
_ds = hsqlds;
_txm = new EmbeddedGeronimoFactory().getTransactionManager();
http://git-wip-us.apache.org/repos/asf/ode/blob/e3b4d2f2/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/SelectObjectTest.java
----------------------------------------------------------------------
diff --git a/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/SelectObjectTest.java b/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/SelectObjectTest.java
index 38e5bf9..c73c90d 100644
--- a/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/SelectObjectTest.java
+++ b/dao-jpa-ojpa-derby/src/test/java/org/apache/ode/dao/jpa/test/SelectObjectTest.java
@@ -69,6 +69,9 @@ public class SelectObjectTest extends TestCase {
hsqlds.setDatabase("jdbc:hsqldb:mem:" + new GUID().toString());
hsqlds.setUser("sa");
hsqlds.setPassword("");
+ Properties prop = new Properties();
+ prop.setProperty("sql.enforce_size", "false");
+ hsqlds.setProperties(prop);
_ds = hsqlds;
_txm = new EmbeddedGeronimoFactory().getTransactionManager();
http://git-wip-us.apache.org/repos/asf/ode/blob/e3b4d2f2/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/DelegateSupport.java
----------------------------------------------------------------------
diff --git a/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/DelegateSupport.java b/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/DelegateSupport.java
index 91359a5..739fed1 100644
--- a/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/DelegateSupport.java
+++ b/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/DelegateSupport.java
@@ -75,7 +75,7 @@ public class DelegateSupport {
}
}
- c.createStatement().executeUpdate("CREATE ALIAS MOD FOR \"org.apache.ode.scheduler.simple.DelegateSupport.mod\";");
+ c.createStatement().executeUpdate("CREATE FUNCTION mod(a BIGINT, b BIGINT) RETURNS BIGINT LANGUAGE JAVA DETERMINISTIC NO SQL EXTERNAL NAME 'CLASSPATH:org.apache.ode.scheduler.simple.DelegateSupport.mod';");
c.createStatement().executeUpdate(sql.toString());
} finally {
c.close();
http://git-wip-us.apache.org/repos/asf/ode/blob/e3b4d2f2/scheduler-simple/src/test/resources/simplesched-hsql.sql
----------------------------------------------------------------------
diff --git a/scheduler-simple/src/test/resources/simplesched-hsql.sql b/scheduler-simple/src/test/resources/simplesched-hsql.sql
index 8edaec7..98e71b6 100644
--- a/scheduler-simple/src/test/resources/simplesched-hsql.sql
+++ b/scheduler-simple/src/test/resources/simplesched-hsql.sql
@@ -1,7 +1,7 @@
CREATE TABLE ode_job (
- jobid CHAR(64) NOT NULL,
+ jobid varchar(64) NOT NULL,
ts BIGINT NOT NULL,
- nodeid char(64),
+ nodeid varchar(64),
scheduled int NOT NULL,
transacted int NOT NULL,
@@ -14,7 +14,7 @@ CREATE TABLE ode_job (
correlationKeySet varchar(255),
retryCount int,
inMem int,
- detailsExt binary(4096),
+ detailsExt blob(4096),
PRIMARY KEY(jobid));