Changeset 6090 for trunk

Timestamp:

May 7, 2010, 2:34:56 AM (14 years ago)

Author:

plg

Message:

bug 1648 fixed: add the pwg_db_check_version functions for pdo-sqlite, sqlite
and pgsql, also make the $pwg_db_link global in the install_db_connect function
so that it can be used in SQLite functions.

bug fixed: with pdo-sqlite, pwg_db_num_rows always returns 0, so when
initializing user data, it tries to insert the same row twice.

Location:

trunk

Files:

• admin/include/functions_install.inc.php (modified) (1 diff)
• include/dblayer/functions_pdo-sqlite.inc.php (modified) (2 diffs)
• include/dblayer/functions_pgsql.inc.php (modified) (1 diff)
• include/dblayer/functions_sqlite.inc.php (modified) (1 diff)
• include/functions_user.inc.php (modified) (1 diff)

trunk/admin/include/functions_install.inc.php

@@ -144 +144 @@
 function install_db_connect(&$infos, &$errors)
 {
+  global $pwg_db_link;
+  
   try
   {

trunk/include/dblayer/functions_pdo-sqlite.inc.php

@@ -22 +22 @@
 // +-----------------------------------------------------------------------+
 
-define('REQUIRED_PDO-SQLITE_VERSION', '3.0.0');
+define('REQUIRED_PDO_SQLITE_VERSION', '3.0.0');
 define('DB_ENGINE', 'SQLite');
 
@@ -54 +54 @@
 
   return $link;
+}
+
+function pwg_db_check_version()
+{
+  $current_version = pwg_get_db_version();
+  if (version_compare($current_version, REQUIRED_PDO_SQLITE_VERSION, '<'))
+  {
+    fatal_error(
+      sprintf(
+        'your database version is too old, you have "%s" and you need at least "%s"',
+        $current_version,
+        REQUIRED_PDO_SQLITE_VERSION
+        )
+      );
+  }
 }
 

trunk/include/dblayer/functions_pgsql.inc.php

@@ -58 +58 @@
   {
     return $link;
+  }
+}
+
+function pwg_db_check_version()
+{
+  $current_version = pwg_get_db_version();
+  if (version_compare($current_version, REQUIRED_PGSQL_VERSION, '<'))
+  {
+    fatal_error(
+      sprintf(
+        'your database version is too old, you have "%s" and you need at least "%s"',
+        $current_version,
+        REQUIRED_PGSQL_VERSION
+        )
+      );
   }
 }

trunk/include/dblayer/functions_sqlite.inc.php

@@ -65 +65 @@
 }
 
+function pwg_db_check_version()
+{
+  $current_version = pwg_get_db_version();
+  if (version_compare($current_version, REQUIRED_SQLITE_VERSION, '<'))
+  {
+    fatal_error(
+      sprintf(
+        'your database version is too old, you have "%s" and you need at least "%s"',
+        $current_version,
+        REQUIRED_SQLITE_VERSION
+        )
+      );
+  }
+}
+
 function pwg_db_check_charset() 
 {

trunk/include/functions_user.inc.php

@@ -299 +299 @@
   WHERE ui.user_id = \''.$user_id.'\'';
     $result = pwg_query($query);
-    if (pwg_db_num_rows($result) > 0)
+    if ($result)
     {
       break;