Merge pull request #55 from PostgreSQL-For-Wordpress/switch-to-mysqli

WIP: Switch to mysqli
PostgreSQL-For-Wordpress · Nov 10, 2023 · bf2ef7f · bf2ef7f
2 parents e3f3682 + 3d164e1
commit bf2ef7f
Show file tree

Hide file tree

Showing 6 changed files with 1,997 additions and 399 deletions.
diff --git a/docs/images/pg4wp_design.png b/docs/images/pg4wp_design.png
diff --git a/pg4wp/core.php b/pg4wp/core.php
@@ -14,13 +14,6 @@
 require_once ABSPATH . '/wp-includes/cache.php';
 require_once ABSPATH . '/wp-includes/l10n.php';
 
-if (!function_exists('wpsql_is_resource')) {
-    function wpsql_is_resource($object)
-    {
-        return $object !== false && $object !== null;
-    }
-}
-
 // Load the driver defined in 'db.php'
 require_once(PG4WP_ROOT . '/driver_' . DB_DRIVER . '.php');
 
@@ -29,20 +22,15 @@ function wpsql_is_resource($object)
     'define( '	=> '// define( ',
     'class wpdb'	=> 'class wpdb2',
     'new wpdb'	=> 'new wpdb2',
-    'mysql_'	=> 'wpsql_',
-    'is_resource'	=> 'wpsql_is_resource',
+    'instanceof mysqli_result' => 'instanceof \PgSql\Result',
+    'instanceof mysqli' => 'instanceof \PgSql\Connection',
+    '$this->dbh->connect_errno' => 'wpsqli_connect_error()',
+    'mysqli_'	=> 'wpsqli_',
+    'is_resource'	=> 'wpsqli_is_resource',
     '<?php'		=> '',
     '?>'		=> '',
 );
 
-// Ensure class uses the replaced mysql_ functions rather than mysqli_
-if (!defined('WP_USE_EXT_MYSQL')) {
-    define('WP_USE_EXT_MYSQL', true);
-}
-if (WP_USE_EXT_MYSQL != true) {
-    throw new \Exception("PG4SQL CANNOT BE ENABLED WITH MYSQLI, REMOVE ANY WP_USE_EXT_MYSQL configuration");
-}
-
 eval(str_replace(array_keys($replaces), array_values($replaces), file_get_contents(ABSPATH . '/wp-includes/class-wpdb.php')));
 
 // Create wpdb object if not already done

diff --git a/pg4wp/db.php b/pg4wp/db.php
@@ -28,12 +28,6 @@
         define('PG4WP_LOG_ERRORS', true);
     }
 
-    if (!defined('PG4WP_INSECURE')) {
-        // If you want to allow insecure configuration (from the author point of view) to work with PG4WP,
-        // change this to true
-        define('PG4WP_INSECURE', false);
-    }
-
     // This defines the directory where PG4WP files are loaded from
     //   3 places checked : wp-content, wp-content/plugins and the base directory
     if(file_exists(ABSPATH . 'wp-content/pg4wp')) {