[jbpm-commits] JBoss JBPM SVN: r5778 - in jbpm4/trunk/modules: distro/src/main/files/install/src/db/create and 1 other directory.

[do-not-reply at jboss.org]

Author: tom.baeyens at jboss.com
Date: 2009-10-23 07:36:57 -0400 (Fri, 23 Oct 2009)
New Revision: 5778

Modified:
   jbpm4/trunk/modules/db/src/main/java/org/jbpm/db/HibernateOperation.java
   jbpm4/trunk/modules/distro/src/main/files/install/src/db/create/jbpm.oracle.create.sql
Log:
for oracle, remove delimiters when executing a script of sql commands

Modified: jbpm4/trunk/modules/db/src/main/java/org/jbpm/db/HibernateOperation.java
===================================================================
--- jbpm4/trunk/modules/db/src/main/java/org/jbpm/db/HibernateOperation.java	2009-10-23 11:30:25 UTC (rev 5777)
+++ jbpm4/trunk/modules/db/src/main/java/org/jbpm/db/HibernateOperation.java	2009-10-23 11:36:57 UTC (rev 5778)
@@ -129,6 +129,11 @@
         j += delimiter.length();
       }
       String command = fileContents.substring(i, j).trim();
+      if ( "oracle".equals(database)
+           && command.endsWith(";")
+         ) {
+        command = command.substring(0, command.length()-1);
+      }
       if (command.length()>0) {
         commands.add(command);
       }

Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/db/create/jbpm.oracle.create.sql
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/src/db/create/jbpm.oracle.create.sql	2009-10-23 11:30:25 UTC (rev 5777)
+++ jbpm4/trunk/modules/distro/src/main/files/install/src/db/create/jbpm.oracle.create.sql	2009-10-23 11:36:57 UTC (rev 5778)
@@ -1,6 +1,22 @@
-create table JBPM4_DEPLOYMENT (DBID_ number(19,0) not null,NAME_ clob,TIMESTAMP_ number(19,0),STATE_ varchar2(255 char),primary key (DBID_));
-create table JBPM4_DEPLOYPROP (DBID_ number(19,0) not null,DEPLOYMENT_ number(19,0),OBJNAME_ varchar2(255 char),KEY_ varchar2(255 char),STRINGVAL_ varchar2(255 char),LONGVAL_ number(19,0),primary key (DBID_));
 
+    create table JBPM4_DEPLOYMENT (
+        DBID_ number(19,0) not null,
+        NAME_ clob,
+        TIMESTAMP_ number(19,0),
+        STATE_ varchar2(255 char),
+        primary key (DBID_)
+    );
+
+    create table JBPM4_DEPLOYPROP (
+        DBID_ number(19,0) not null,
+        DEPLOYMENT_ number(19,0),
+        OBJNAME_ varchar2(255 char),
+        KEY_ varchar2(255 char),
+        STRINGVAL_ varchar2(255 char),
+        LONGVAL_ number(19,0),
+        primary key (DBID_)
+    );
+
     create table JBPM4_EXECUTION (
         DBID_ number(19,0) not null,
         CLASS_ varchar2(255 char) not null,