summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2014-10-27 12:09:47 +0100
committerAleksander Machniak <alec@alec.pl>2014-10-27 12:09:47 +0100
commit9aa55d5a50bd4c219f409dcd1c42c373c7dcfdb8 (patch)
tree0bf4109168ac7f10ef7036b450d6f47b2551f129
parent922f30cb4ea4c7250d78144ce798f149e6e1bdb6 (diff)
Fix so DDL script for Oracle can be executed in SQLPlus
-rw-r--r--SQL/oracle.initial.sql10
-rw-r--r--program/lib/Roundcube/rcube_db_oracle.php2
2 files changed, 6 insertions, 6 deletions
diff --git a/SQL/oracle.initial.sql b/SQL/oracle.initial.sql
index 84f7a1f16..d32cc926f 100644
--- a/SQL/oracle.initial.sql
+++ b/SQL/oracle.initial.sql
@@ -20,7 +20,7 @@ BEFORE INSERT ON "users" FOR EACH ROW
BEGIN
:NEW."user_id" := "users_seq".nextval;
END;
-
+/
CREATE TABLE "session" (
"sess_id" varchar(128) NOT NULL PRIMARY KEY,
@@ -60,7 +60,7 @@ BEFORE INSERT ON "identities" FOR EACH ROW
BEGIN
:NEW."identity_id" := "identities_seq".nextval;
END;
-
+/
CREATE TABLE "contacts" (
"contact_id" integer PRIMARY KEY,
@@ -86,7 +86,7 @@ BEFORE INSERT ON "contacts" FOR EACH ROW
BEGIN
:NEW."contact_id" := "contacts_seq".nextval;
END;
-
+/
CREATE TABLE "contactgroups" (
"contactgroup_id" integer PRIMARY KEY,
@@ -107,7 +107,7 @@ BEFORE INSERT ON "contactgroups" FOR EACH ROW
BEGIN
:NEW."contactgroup_id" := "contactgroups_seq".nextval;
END;
-
+/
CREATE TABLE "contactgroupmembers" (
"contactgroup_id" integer NOT NULL
@@ -211,7 +211,7 @@ BEFORE INSERT ON "searches" FOR EACH ROW
BEGIN
:NEW."search_id" := "searches_seq".nextval;
END;
-
+/
CREATE TABLE "system" (
"name" varchar(64) NOT NULL PRIMARY KEY,
diff --git a/program/lib/Roundcube/rcube_db_oracle.php b/program/lib/Roundcube/rcube_db_oracle.php
index 338eb2e2a..362beb075 100644
--- a/program/lib/Roundcube/rcube_db_oracle.php
+++ b/program/lib/Roundcube/rcube_db_oracle.php
@@ -500,7 +500,7 @@ class rcube_db_oracle extends rcube_db
foreach (explode("\n", $sql) as $line) {
$tok = strtolower(trim($line));
- if (preg_match('/^--/', $line) || $tok == '') {
+ if (preg_match('/^--/', $line) || $tok == '' || $tok == '/') {
continue;
}