Changeset 4325 for trunk/upgrade.php

Timestamp:

Nov 20, 2009, 3:17:04 PM (14 years ago)

Author:

nikrou

Message:

Feature 1244 resolved
Replace all mysql functions in core code by ones independant of database engine

Fix small php code synxtax : hash must be accessed with [ ] and not { }.

File:

• trunk/upgrade.php (modified) (4 diffs)

trunk/upgrade.php

@@ -44 +44 @@
 include(PHPWG_ROOT_PATH . 'include/config_default.inc.php');
 @include(PHPWG_ROOT_PATH. 'include/config_local.inc.php');
+include(PHPWG_ROOT_PATH .'include/dblayer/functions_mysql.inc.php');
 
 prepare_conf_upgrade();
@@ -51 +52 @@
 
 // Database connection
-mysql_connect( $conf['db_host'], $conf['db_user'], $conf['db_password'] ) or die ( "Could not connect to database server" );
-mysql_select_db( $conf['db_base'] ) or die ( "Could not connect to database" );
-if ( version_compare(mysql_get_server_info(), '4.1.0', '>=')
-    and defined('DB_CHARSET') and DB_CHARSET!='' )
-{
-  pwg_query('SET NAMES "'.DB_CHARSET.'"');
-}
+$pwg_db_link = pwg_db_connect($conf['db_host'], $conf['db_user'], 
+                              $conf['db_password'], $conf['db_base']) 
+  or my_error('pwg_db_connect', true);
+
+pwg_db_check_charset();
 
 // +-----------------------------------------------------------------------+
@@ -77 +76 @@
   $result = pwg_query($query);
 
-  while ($row = mysql_fetch_row($result))
+  while ($row = pwg_db_fetch_row($result))
   {
     if (preg_match('/^'.PREFIX_TABLE.'/', $row[0]))
@@ -106 +105 @@
     $columns_of[$table] = array();
 
-    while ($row = mysql_fetch_row($result))
+    while ($row = pwg_db_fetch_row($result))
     {
       array_push($columns_of[$table], $row[0]);