From: mkanat%bugzilla.org <>
Date: Sat, 4 Apr 2009 04:11:25 +0000 (+0000)
Subject: Bug 486239: [Oracle] Missing keyword RESTRICT on fk creation (DB::Schema explicitly... 
X-Git-Tag: bugzilla-3.5.1~263
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c536d9c715f931d06e28850dba33241f43a078c;p=thirdparty%2Fbugzilla.git

Bug 486239: [Oracle] Missing keyword RESTRICT on fk creation (DB::Schema explicitly specified DELETE => 'RESTRICT')
Patch by Xiaoou Wu <xiaoou.wu@oracle.com> and Max Kanat-Alexander <mkanat@bugzilla.org> r=mkanat
---

diff --git a/Bugzilla/DB/Schema.pm b/Bugzilla/DB/Schema.pm
index 7f094983f8..fc4361d175 100644
--- a/Bugzilla/DB/Schema.pm
+++ b/Bugzilla/DB/Schema.pm
@@ -381,8 +381,7 @@ use constant ABSTRACT_SCHEMA => {
                                                DELETE => 'CASCADE'}},
             who             => {TYPE => 'INT3', NOTNULL => 1,
                                 REFERENCES => {TABLE => 'profiles',
-                                               COLUMN => 'userid',
-                                               DELETE => 'RESTRICT'}},
+                                               COLUMN => 'userid'}},
             bug_when        => {TYPE => 'DATETIME', NOTNULL => 1},
             work_time       => {TYPE => 'decimal(5,2)', NOTNULL => 1,
                                 DEFAULT => '0'},
diff --git a/Bugzilla/DB/Schema/Oracle.pm b/Bugzilla/DB/Schema/Oracle.pm
index 8332be707a..d8b24e49b9 100644
--- a/Bugzilla/DB/Schema/Oracle.pm
+++ b/Bugzilla/DB/Schema/Oracle.pm
@@ -145,6 +145,9 @@ sub get_fk_ddl {
     my $to_column = $references->{COLUMN} || confess "No column in reference";
     my $fk_name   = $self->_get_fk_name($table, $column, $references);
 
+    # 'ON DELETE RESTRICT' is enabled by default   
+    $delete = "" if ($delete =~ /RESTRICT/i);
+
     my $fk_string = "\n     CONSTRAINT $fk_name FOREIGN KEY ($column)\n"
                     . "     REFERENCES $to_table($to_column)\n";