patches for postgres 15 compatibility, various warnings fixes and more

pg4wp/driver_pgsql.php

@@ -39,7 +39,7 @@ function wpsql_fetch_field($result)
 	function wpsql_fetch_object($result)
 		{ return pg_fetch_object($result); }
 	function wpsql_free_result($result)
-		{ return pg_free_result($result); }
+		{ return ($result === null) ? true : pg_free_result($result); }
 	function wpsql_affected_rows()
 	{
 		if( $GLOBALS['pg4wp_result'] === false)
@@ -52,11 +52,12 @@ function wpsql_fetch_row($result)
 	function wpsql_data_seek($result, $offset)
 		{ return pg_result_seek ( $result, $offset ); }
 	function wpsql_error()
-		{ if( $GLOBALS['pg4wp_conn']) return pg_last_error(); else return ''; }
+		{ if( $GLOBALS['pg4wp_conn']) return pg_last_error($GLOBALS['pg4wp_conn']); else return ''; }
 	function wpsql_fetch_assoc($result) { return pg_fetch_assoc($result); }
 	function wpsql_escape_string($s) { return pg_escape_string($s); }
-	function wpsql_real_escape_string($s,$c=NULL) { return pg_escape_string($s); }
-	function wpsql_get_server_info() { return '5.0.30'; } // Just want to fool wordpress ...
+	function wpsql_real_escape_string($s,$c=NULL) { return pg_escape_string($GLOBALS['pg4wp_conn'],$s); }
+	function wpsql_get_server_info() { return '8.0.35'; } // Just want to fool wordpress ...
+	function wpsql_get_client_info() { return '8.0.35'; } // Just want to fool wordpress ...
 
 /**** Modified version of wpsql_result() is at the bottom of this file
 	function wpsql_result($result, $i, $fieldname)
@@ -136,8 +137,8 @@ function wpsql_query($sql)
 		$initial = $sql;
 		$sql = pg4wp_rewrite( $sql);
 
-		$GLOBALS['pg4wp_result'] = pg_query($sql);
-		if( (PG4WP_DEBUG || PG4WP_LOG_ERRORS) && $GLOBALS['pg4wp_result'] === false && $err = pg_last_error())
+		$GLOBALS['pg4wp_result'] = pg_query($GLOBALS['pg4wp_conn'], $sql);
+		if( (PG4WP_DEBUG || PG4WP_LOG_ERRORS) && $GLOBALS['pg4wp_result'] === false && $err = pg_last_error($GLOBALS['pg4wp_conn']))
 		{
 			$ignore = false;
 			if( defined('WP_INSTALLING') && WP_INSTALLING)
@@ -239,12 +240,15 @@ function pg4wp_rewrite( $sql)
 			{
 				// Here we convert the latest query into a COUNT query
 				$sql = $GLOBALS['pg4wp_numrows_query'];
-				// Remove any LIMIT ... clause (this is the blocking part)
-				$pattern = '/\s+LIMIT.+/';
-				$sql = preg_replace( $pattern, '', $sql);
-				// Now add the COUNT() statement
-				$pattern = '/SELECT\s+([^\s]+)\s+(FROM.+)/';
-				$sql = preg_replace( $pattern, 'SELECT COUNT($1) $2', $sql);
+
+				// Remove the LIMIT clause if it exists
+				$sql = preg_replace('/\s+LIMIT\s+\d+(\s*,\s*\d+)?/i', '', $sql);
+
+				// Remove the ORDER BY clause if it exists
+				$sql = preg_replace('/\s+ORDER\s+BY\s+[^)]+/i', '', $sql);
+
+				// Replace the fields in the SELECT clause with COUNT(*)
+				$sql = preg_replace('/SELECT\s+.*?\s+FROM\s+/is', 'SELECT COUNT(*) FROM ', $sql, 1);
 			}
 
 			// Ensure that ORDER BY column appears in SELECT DISTINCT fields
@@ -501,7 +505,7 @@ function pg4wp_rewrite( $sql)
 			}
 
 			// Akismet sometimes doesn't write 'comment_ID' with 'ID' in capitals where needed ...
-			if( false !== strpos( $sql, $wpdb->comments))
+			if(isset($wpdb) && $wpdb->comments && false !== strpos( $sql, $wpdb->comments))
 				$sql = str_replace(' comment_id ', ' comment_ID ', $sql);
 		}
 		// Fix tables listing
@@ -620,7 +624,7 @@ function pg4wp_init()
 		//        Can define version with typed first arg to cover some cases.
 		// Note:  ROW_NUMBER+unnest doesn't guarantee order, but is simple/fast.
 		//        If it breaks, try https://stackoverflow.com/a/8767450
-		$result = pg_query(<<<SQL
+		$result = pg_query($GLOBALS['pg4wp_conn'],<<<SQL
 CREATE OR REPLACE FUNCTION field(anyelement, VARIADIC anyarray)
 	RETURNS BIGINT AS
 $$
@@ -657,6 +661,10 @@ function wpsql_result($result, $i, $fieldname = null) {
 
 	function wpsql_errno( $connection) {
 		$result = pg_get_result($connection);
+		if ($result === false) {
+			return false;
+		}
+
 		$result_status = pg_result_status($result);
 		return pg_result_error_field($result_status, PGSQL_DIAG_SQLSTATE);
 	}

pg4wp/driver_pgsql_install.php

@@ -228,9 +228,9 @@ function pg4wp_installing( $sql, &$logto)
 		ELSE 'YES'
 	END AS \"Null\",
 	CASE pg_type.typname
-		WHEN 'varchar' THEN substring(pg_attrdef.adsrc FROM '^''(.*)''.*$')
-		WHEN 'timestamp' THEN CASE WHEN pg_attrdef.adsrc LIKE '%now()%' THEN '0000-00-00 00:00:00' ELSE pg_attrdef.adsrc END
-		ELSE pg_attrdef.adsrc
+		WHEN 'varchar' THEN substring(pg_get_expr(pg_attrdef.adbin, pg_attrdef.adrelid) FROM '^''(.*)''.*$')
+		WHEN 'timestamp' THEN CASE WHEN pg_get_expr(pg_attrdef.adbin, pg_attrdef.adrelid) LIKE '%now()%' THEN '0000-00-00 00:00:00' ELSE pg_get_expr(pg_attrdef.adbin, pg_attrdef.adrelid) END
+		ELSE pg_get_expr(pg_attrdef.adbin, pg_attrdef.adrelid) 
 	END AS \"Default\"
 FROM pg_class
 	INNER JOIN pg_attribute