add routines to use upgrade 3.3

add 'filling breqemail column' query line
add 'AFTER cblog' for insertion of column, cname
add cemail column insertion routine

git-svn-id: https://svn.sourceforge.jp/svnroot/nucleus-jp/nucleus-jp/trunk@254 1ca29b6e-896d-4ea0-84a5-967f57386b96

diff --git a/utf8/nucleus/upgrades/index.php b/utf8/nucleus/upgrades/index.php
index c9ab503..0c994a3 100755 (executable)
--- a/utf8/nucleus/upgrades/index.php
+++ b/utf8/nucleus/upgrades/index.php
@@ -9,8 +9,8 @@
   * of the License, or (at your option) any later version.
   * (see nucleus/documentation/index.html#license for more info)
   *
-  * $Id: index.php,v 1.8 2007-02-04 06:28:46 kimitake Exp $
-  * $NucleusJP: index.php,v 1.7 2006/07/17 20:03:45 kimitake Exp $
+  * $Id: index.php,v 1.9 2007-04-10 03:55:20 kmorimatsu Exp $
+  * $NucleusJP: index.php,v 1.8 2007/02/04 06:28:46 kimitake Exp $
   */
 
 include('upgrade.functions.php'); 
@@ -49,9 +49,10 @@ upgrade_head();
   else  if (!upgrade_checkinstall(30)) $current = 25;      
   else  if (!upgrade_checkinstall(31)) $current = 30;      
   else  if (!upgrade_checkinstall(32)) $current = 31;      
-  else  $current = 32;
+  else  if (!upgrade_checkinstall(33)) $current = 32;      
+  else  $current = 33;
 
-  if ($current == 32) {
+  if ($current == 33) {
     ?>
       <p class="ok">自動でできるアップグレードはありません。データベースは既に最新の Nucleus 用にアップデートされています。</p>
     <?php  } else {

diff --git a/utf8/nucleus/upgrades/upgrade.functions.php b/utf8/nucleus/upgrades/upgrade.functions.php
index ccfff23..f74f1a8 100755 (executable)
--- a/utf8/nucleus/upgrades/upgrade.functions.php
+++ b/utf8/nucleus/upgrades/upgrade.functions.php
@@ -12,8 +12,8 @@
          *     
          * Some functions common to all upgrade scripts
          *
-         * $Id: upgrade.functions.php,v 1.7 2007-02-04 06:28:46 kimitake Exp $
-         * $NucleusJP: upgrade.functions.php,v 1.6 2006/07/12 07:11:49 kimitake Exp $
+         * $Id: upgrade.functions.php,v 1.8 2007-04-10 03:55:20 kmorimatsu Exp $
+         * $NucleusJP: upgrade.functions.php,v 1.7 2007/02/04 06:28:46 kimitake Exp $
          */
 
        include('../../config.php');
@@ -204,7 +204,7 @@
                global $upgrade_failures;
                
                echo "<li>$friendly ... ";
-               $res = mysql_query($query);
+               $res = sql_query($query);
                if (!$res) {
                        echo "<span style='color:red'>失敗</span>\n";
                        echo "<blockquote>失敗の理由: " . mysql_error() . " </blockquote>";

diff --git a/utf8/nucleus/upgrades/upgrade.php b/utf8/nucleus/upgrades/upgrade.php
index 3ab75d1..c5e444d 100755 (executable)
--- a/utf8/nucleus/upgrades/upgrade.php
+++ b/utf8/nucleus/upgrades/upgrade.php
@@ -9,8 +9,8 @@
   * of the License, or (at your option) any later version.
   * (see nucleus/documentation/index.html#license for more info)
   *
-  * $Id: upgrade.php,v 1.5 2007-02-04 06:28:46 kimitake Exp $
-  * $NucleusJP: upgrade.php,v 1.4 2006/07/12 07:11:49 kimitake Exp $
+  * $Id: upgrade.php,v 1.6 2007-04-10 03:55:20 kmorimatsu Exp $
+  * $NucleusJP: upgrade.php,v 1.5 2007/02/04 06:28:46 kimitake Exp $
   */
 
 include('upgrade.functions.php'); 
@@ -34,6 +34,7 @@ include('upgrade2.5.php');
 include('upgrade3.0.php');
 include('upgrade3.1.php');
 include('upgrade3.2.php');
+include('upgrade3.3.php');
 
 $from = intGetVar('from');
 
@@ -59,6 +60,8 @@ switch($from) {
                upgrade_do31();
        case 31:
                upgrade_do32();
+       case 32:
+               upgrade_do33();
                break;
        default:
                echo "<li>エラー! 実行すべきアップデートはありません</li>";

diff --git a/utf8/nucleus/upgrades/upgrade3.3.php b/utf8/nucleus/upgrades/upgrade3.3.php
index 7e877bb..96f2029 100644 (file)
--- a/utf8/nucleus/upgrades/upgrade3.3.php
+++ b/utf8/nucleus/upgrades/upgrade3.3.php
@@ -6,13 +6,14 @@ function upgrade_do33() {
 
        // alter nucleus_blog table
        $query = 'ALTER TABLE ' . sql_table('blog')
-                  . ' ADD breqemail TINYINT(2) DEFAULT '0' NOT NULL';
+                  . ' ADD breqemail TINYINT(2) DEFAULT \'0\' NOT NULL';
        upgrade_query('Altering ' . sql_table('blog') . ' table', $query);
 
        // insert breqemail default value
        $query = 'INSERT INTO ' . sql_table('blog')
                   . ' (breqemail)'
                   . ' VALUES (0)';
+       upgrade_query('Filling breqemail column of ' . sql_table('blog') . ' table', $query);
 
        // store cname from nucleus_category
        $query = 'SELECT catid, cname FROM ' . sql_table('category') . ' ORDER By catid ASC';
@@ -28,50 +29,25 @@ function upgrade_do33() {
        // alter nucleus_category
        $query = 'ALTER TABLE ' . sql_table('category')
                   . ' DROP COLUMN cname,'
-                  . ' ADD cname varchar(200) default NULL';
+                  . ' ADD cname varchar(200) default NULL AFTER cblog';
        upgrade_query('Altering ' . sql_table('category') . ' table', $query);
 
        // refill cname to nucleus_category
        foreach ($aValues as $aInfo) {
-               $query = 'INSERT INTO ' . sql_table('category')
-                          . ' (cname)'
-                          . " VALUES (" . $aInfo['cname'] . ")"
+               $query = 'UPDATE ' . sql_table('category')
+                          . ' SET cname='
+                          . " '" . addslashes($aInfo['cname']) . "'"
                           . " WHERE catid=" . $aInfo['catid'];
                upgrade_query('Re-filling ' . sql_table('category')
                        . ' (' . $aInfo['catid'] . ')', $query);
        }
 
+       // alter nucleus_comment
+       $query = 'ALTER TABLE ' . sql_table('comment')
+                  . ' ADD cemail varchar(100)'
+                  . ' AFTER cmail';
+       upgrade_query('Altering ' . sql_table('comment') . ' table', $query);
        
-/*
-       // create nucleus_activation table
-       $query = 'CREATE TABLE ' . sql_table('activation') . ' ('
-                  . ' vkey varchar(40) NOT NULL default \'\','
-                  . ' vtime datetime NOT NULL default \'0000-00-00 00:00:00\','
-                  . ' vmember int(11) NOT NULL default \'0\','
-                  . ' vtype varchar(15) NOT NULL default \'\','
-                  . ' vextra varchar(128) NOT NULL default \'\','
-                  . ' PRIMARY KEY  (vkey) '
-                  . ' )';
-    upgrade_query('Creating account activation table', $query);    
-
-       // create CookiePrefix setting
-       $query = 'INSERT INTO '.sql_table('config')." VALUES ('CookiePrefix','')";
-       upgrade_query('Creating CookiePrefix config value',$query);     
-               
-       // create nucleus_tickets table
-       $query = 'CREATE TABLE ' . sql_table('tickets') . ' ('
-                  . ' ticket varchar(40) NOT NULL default \'\','
-                  . ' ctime datetime NOT NULL default \'0000-00-00 00:00:00\','
-                  . ' member int(11) NOT NULL default \'0\', '
-                  . ' PRIMARY KEY  (ticket, member) '
-                  . ' )';
-    upgrade_query('Creating ticket table', $query);    
-
-       // 3.1 -> 3.1+
-       // update database version  
-       $query = 'UPDATE ' . sql_table('config') . ' set value=\'320\' where name=\'DatabaseVersion\'';
-       upgrade_query('Updating DatabaseVersion in config table to 320', $query);
-*/     
        // nothing!
 }