diff options
author | Meik Sievertsen <acydburn@phpbb.com> | 2009-06-13 14:48:45 +0000 |
---|---|---|
committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-06-13 14:48:45 +0000 |
commit | d843dbd046fa427d00d30ef06558043e46c6fc98 (patch) | |
tree | da8692eac8b50f9b1ef9e0cbb5ab1b620da25076 | |
parent | 2d30e880899d7a15c0cac5c1f03c951fb0ceb5be (diff) | |
download | forums-d843dbd046fa427d00d30ef06558043e46c6fc98.tar forums-d843dbd046fa427d00d30ef06558043e46c6fc98.tar.gz forums-d843dbd046fa427d00d30ef06558043e46c6fc98.tar.bz2 forums-d843dbd046fa427d00d30ef06558043e46c6fc98.tar.xz forums-d843dbd046fa427d00d30ef06558043e46c6fc98.zip |
Fix sql_column_exists for oracle (oracle uses uppercase table names)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9583 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r-- | phpBB/includes/db/db_tools.php | 2 | ||||
-rw-r--r-- | phpBB/install/database_update.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/db/db_tools.php b/phpBB/includes/db/db_tools.php index bc6b027b1f..8c8653e1da 100644 --- a/phpBB/includes/db/db_tools.php +++ b/phpBB/includes/db/db_tools.php @@ -801,7 +801,7 @@ class phpbb_db_tools case 'oracle': $sql = "SELECT column_name FROM user_tab_columns - WHERE table_name = '{$table}'"; + WHERE LOWER(table_name) = '" . strtolower($table) . "'"; $result = $this->db->sql_query($sql); while ($row = $this->db->sql_fetchrow($result)) { diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index bb48b57a13..992db93452 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -912,7 +912,6 @@ function change_database_data(&$no_updates, $version) set_config('captcha_gd_wave', 0); set_config('captcha_gd_3d_noise', 1); set_config('captcha_gd_fonts', 1); - set_config('confirm_refresh', 1); // Maximum number of keywords @@ -949,6 +948,7 @@ function change_database_data(&$no_updates, $version) WHERE bot_agent = 'ichiro/2'"; _sql($sql, $errored, $error_ary); + // Before we are able to add a unique key to auth_option, we need to remove duplicate entries // We get duplicate entries first @@ -1637,7 +1637,7 @@ class updater_db_tools case 'oracle': $sql = "SELECT column_name FROM user_tab_columns - WHERE table_name = '{$table}'"; + WHERE LOWER(table_name) = '" . strtolower($table) . "'"; $result = $this->db->sql_query($sql); while ($row = $this->db->sql_fetchrow($result)) { |