Bug 308717: Column name "PUBLIC" in SERIES table is an Oracle reserved word

Patch By Lance Larsh <lance.larsh@oracle.com> r=mkanat, a=justdave

diff --git a/Bugzilla/DB/Schema.pm b/Bugzilla/DB/Schema.pm
index 5f8fe48695bad959215b6803de2ccf25bf868a66..ccbef98346afc3dfbb039ffb5dd4b22ac09b9ecd 100644 (file)
--- a/Bugzilla/DB/Schema.pm
+++ b/Bugzilla/DB/Schema.pm
@@ -873,7 +873,7 @@ use constant ABSTRACT_SCHEMA => {
             frequency   => {TYPE => 'INT2', NOTNULL => 1},
             last_viewed => {TYPE => 'DATETIME'},
             query       => {TYPE => 'MEDIUMTEXT', NOTNULL => 1},
-            public      => {TYPE => 'BOOLEAN', NOTNULL => 1,
+            is_public   => {TYPE => 'BOOLEAN', NOTNULL => 1,
                             DEFAULT => 'FALSE'},
         ],
         INDEXES => [

diff --git a/Bugzilla/Series.pm b/Bugzilla/Series.pm
index db4e1f9f97497bc80c712b269211674d515a87ad..521357488d7ce202e35fd871e73124dcb5295736 100644 (file)
--- a/Bugzilla/Series.pm
+++ b/Bugzilla/Series.pm
@@ -18,6 +18,7 @@
 # Rights Reserved.
 #
 # Contributor(s): Gervase Markham <gerv@gerv.net>
+#                 Lance Larsh <lance.larsh@oracle.com>
 
 use strict;
 use lib ".";
@@ -90,7 +91,7 @@ sub initFromDatabase {
     my $dbh = Bugzilla->dbh;
     my @series = $dbh->selectrow_array("SELECT series.series_id, cc1.name, " .
         "cc2.name, series.name, series.creator, series.frequency, " .
-        "series.query, series.public " .
+        "series.query, series.is_public " .
         "FROM series " .
         "LEFT JOIN series_categories AS cc1 " .
         "    ON series.category = cc1.id " .
@@ -103,11 +104,11 @@ sub initFromDatabase {
         "    AND ugm.user_id = " . Bugzilla->user->id .
         "    AND isbless = 0 " .
         "WHERE series.series_id = $series_id AND " .
-        "(public = 1 OR creator = " . Bugzilla->user->id . " OR " .
+        "(is_public = 1 OR creator = " . Bugzilla->user->id . " OR " .
         "(ugm.group_id IS NOT NULL)) " . 
         $dbh->sql_group_by('series.series_id', 'cc1.name, cc2.name, ' .
                            'series.name, series.creator, series.frequency, ' .
-                           'series.query, series.public'));
+                           'series.query, series.is_public'));
     
     if (@series) {
         $self->initFromParameters(@series);
@@ -189,7 +190,7 @@ sub writeToDatabase {
         my $dbh = Bugzilla->dbh;
         $dbh->do("UPDATE series SET " .
                  "category = ?, subcategory = ?," .
-                 "name = ?, frequency = ?, public = ?  " .
+                 "name = ?, frequency = ?, is_public = ?  " .
                  "WHERE series_id = ?", undef,
                  $category_id, $subcategory_id, $self->{'name'},
                  $self->{'frequency'}, $self->{'public'}, 
@@ -198,7 +199,7 @@ sub writeToDatabase {
     else {
         # Insert the new series into the series table
         $dbh->do("INSERT INTO series (creator, category, subcategory, " .
-                 "name, frequency, query, public) VALUES " . 
+                 "name, frequency, query, is_public) VALUES " . 
                  "($self->{'creator'}, " . 
                  "$category_id, $subcategory_id, " .
                  $dbh->quote($self->{'name'}) . ", $self->{'frequency'}," .

diff --git a/checksetup.pl b/checksetup.pl
index 1ad8124cfb9f233103615e15c67788af1da0dc82..2c7eca5c192347a172669a5ec4b1f3cf593b2229 100755 (executable)
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -4031,6 +4031,14 @@ if ($dbh->bz_column_info("attachments", "thedata")) {
     $dbh->bz_drop_column("attachments", "thedata");    
 }
 
+# 2005-09-15 lance.larsh@oracle.com Bug 308717
+if ($dbh->bz_column_info("series", "public")) {
+    # PUBLIC is a reserved word in Oracle, so renaming the column
+    # PUBLIC in table SERIES avoids having to quote the column name
+    # in every query against that table
+    $dbh->bz_rename_column('series', 'public', 'is_public');
+}
+
 
 # If you had to change the --TABLE-- definition in any way, then add your
 # differential change code *** A B O V E *** this comment.