[geeklog-cvs] geeklog: Fix PgSQL queries for the new configuration UI.

[geeklog-cvs at lists.geeklog.net]

changeset 8098:bc18fb77394d
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/bc18fb77394d
user: Rouslan Placella <rouslan at placella.com>
date: Fri Feb 11 19:53:17 2011 +0000
description:
Fix PgSQL queries for the new configuration UI.

diffstat:

 sql/updates/pgsql_1.7.1_to_1.8.0.php |  5 +++--
 system/classes/config.class.php      |  2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diffs (34 lines):

diff -r d9c55a4c7e4c -r bc18fb77394d sql/updates/pgsql_1.7.1_to_1.8.0.php
--- a/sql/updates/pgsql_1.7.1_to_1.8.0.php	Sat Feb 12 16:30:12 2011 +0100
+++ b/sql/updates/pgsql_1.7.1_to_1.8.0.php	Fri Feb 11 19:53:17 2011 +0000
@@ -4,7 +4,7 @@
 $_SQL[] = "ALTER TABLE {$_TABLES['plugins']} ADD COLUMN pi_load smallint NOT NULL DEFAULT (10000)::smallint";
 
 // Add Tab column in for config
-$_SQL[] = "ALTER TABLE {$_TABLES['conf_values']} ADD tab int default NULL AFTER sort_order";
+$_SQL[] = "ALTER TABLE {$_TABLES['conf_values']} ADD COLUMN tab int default NULL";
 // Set new Tab column to whatever fieldset is
 $_SQL[] = "UPDATE {$_TABLES['conf_values']} SET tab = fieldset WHERE group_name = 'Core'";
 // Make a few corrections, let default_permissions_story share it's tab with default_permissions_topic and default_permissions_block
@@ -14,7 +14,8 @@
 $_SQL[] = "UPDATE {$_TABLES['conf_values']} SET tab = 37 WHERE group_name = 'Core' AND name = 'default_permissions_block'";
 
 // Increase name length to 50 on features table
-$_SQL[] = "ALTER TABLE {$_TABLES['features']} CHANGE ft_name ft_name VARCHAR(50) NOT NULL";
+$_SQL[] = "ALTER TABLE {$_TABLES['features']} ALTER COLUMN ft_name TYPE VARCHAR(50)";
+$_SQL[] = "ALTER TABLE {$_TABLES['features']} ALTER COLUMN ft_name SET NOT NULL";
 
 // Insert Group rights for configuration tabs
 $_SQL[] = "INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.Core.tab_site', 'Access to configure site', 1)";
diff -r d9c55a4c7e4c -r bc18fb77394d system/classes/config.class.php
--- a/system/classes/config.class.php	Sat Feb 12 16:30:12 2011 +0100
+++ b/system/classes/config.class.php	Fri Feb 11 19:53:17 2011 +0000
@@ -196,7 +196,7 @@
         global $_TABLES;
 
         // Figure out tabs first
-        $sql = "SELECT name, value, group_name, type, subgroup, tab FROM {$_TABLES['conf_values']} WHERE 1";
+        $sql = "SELECT name, value, group_name, type, subgroup, tab FROM {$_TABLES['conf_values']} WHERE 1=1";
         $result = DB_query($sql);
         $tabs = array();
         $curr_group_name = '';