From 8f3e3695e395c17a3bdff540c6db671e51087cf5 Mon Sep 17 00:00:00 2001
From: mjollnir_ <mjollnir_>
Date: Wed, 15 Jun 2005 22:36:20 +0000
Subject: [PATCH] Fixing bug 3502 - 2 postgres problems - one in db creation
 (my fault) and one in '' instead of 0 for int in sql query

---
 mod/quiz/db/postgres7.php | 10 +++++++++-
 mod/quiz/db/postgres7.sql |  2 +-
 mod/quiz/editlib.php      |  4 ++--
 mod/quiz/version.php      |  2 +-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/mod/quiz/db/postgres7.php b/mod/quiz/db/postgres7.php
index dbbaf6982e1..92c9784e168 100644
--- a/mod/quiz/db/postgres7.php
+++ b/mod/quiz/db/postgres7.php
@@ -523,7 +523,7 @@ function quiz_upgrade($oldversion) {
                                  template_vars text NOT NULL
                                );");
 
-        modify_database ('', "CREATE TABLE prefix_quiz_rqp_type (
+        modify_database ('', "CREATE TABLE prefix_quiz_rqp_types (
                                 id SERIAL PRIMARY KEY,
                                 name varchar(255) NOT NULL default '',
                                 rendering_server varchar(255) NOT NULL default '',
@@ -912,6 +912,14 @@ function quiz_upgrade($oldversion) {
         $db->debug = $olddebug;
     }
 
+    if ($oldversion < 2005060301) {
+        execute_sql('ALTER TABLE '.$CFG->prefix.'quiz_rqp_type RENAME TO '.$CFG->prefix.'quiz_rqp_types');
+        execute_sql('ALTER TABLE '.$CFG->prefix.'quiz_rqp_type_id_seq RENAME TO '.$CFG->prefix.'rqp_types_id_seq');
+        execute_sql('ALTER TABLE '.$CFG->prefix.'quiz_rqp_types ALTER COLUMN id SET DEFAULT nextval(\''.$CFG->prefix.'quiz_rqp_types_id_seq\')');
+        execute_sql('DROP INDEX '.$CFG->prefix.'quiz_rqp_type_name_uk');
+        execute_sql('CREATE UNIQUE INDEX '.$CFG->prefix.'quiz_rqp_types_name_uk ON '.$CFG->prefix.'quiz_rqp_types (name);');
+
+    }
 
     return true;
 }
diff --git a/mod/quiz/db/postgres7.sql b/mod/quiz/db/postgres7.sql
index 1462c4c4a2a..d9d48ec9eba 100644
--- a/mod/quiz/db/postgres7.sql
+++ b/mod/quiz/db/postgres7.sql
@@ -410,7 +410,7 @@ CREATE TABLE prefix_quiz_rqp_states (
 # Table structure for table prefix_quiz_rqp_type
 #
 
-CREATE TABLE prefix_quiz_rqp_type (
+CREATE TABLE prefix_quiz_rqp_types (
   id SERIAL PRIMARY KEY,
   name varchar(255) NOT NULL default '',
   rendering_server varchar(255) NOT NULL default '',
diff --git a/mod/quiz/editlib.php b/mod/quiz/editlib.php
index d2f52b9b757..20d18b94373 100644
--- a/mod/quiz/editlib.php
+++ b/mod/quiz/editlib.php
@@ -194,7 +194,7 @@ function quiz_print_question_list($quiz, $allowdelete=true, $showbreaks=true) {
         echo "<p align=\"center\">";
         print_string("noquestions", "quiz");
         echo "</p>";
-        return;
+        return 0;
     }
 
     if (!$questions = get_records_sql("SELECT q.*,c.course
@@ -205,7 +205,7 @@ function quiz_print_question_list($quiz, $allowdelete=true, $showbreaks=true) {
         echo "<p align=\"center\">";
         print_string("noquestions", "quiz");
         echo "</p>";
-        return;
+        return 0;
     }
 
     $count = 0;
diff --git a/mod/quiz/version.php b/mod/quiz/version.php
index 797a0ccf20c..79b2010a3e0 100644
--- a/mod/quiz/version.php
+++ b/mod/quiz/version.php
@@ -5,7 +5,7 @@
 //  This fragment is called by moodle_needs_upgrading() and /admin/index.php
 ////////////////////////////////////////////////////////////////////////////////
 
-$module->version  = 2005060300;   // The (date) version of this module
+$module->version  = 2005060301;   // The (date) version of this module
 $module->requires = 2005021600;   // Requires this Moodle version
 $module->cron     = 0;            // How often should cron check this module (seconds)?