PostgreSQL-For-Wordpress/postgresql-for-wordpress
1
0
Fork 1
mirror of https://github.com/PostgreSQL-For-Wordpress/postgresql-for-wordpress.git synced 2025-08-01 10:44:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Modified the method for counting rows as mysql counts avery rows ignoring the limit clause

Browse Source 
git-svn-id: https://plugins.svn.wordpress.org/postgresql-for-wordpress/trunk@436140 b8457f37-d9ea-0310-8a92-e5e31aec5664
This commit is contained in:
hawk__
2011-09-10 22:11:30 +00:00
parent fb9bcadebd
commit 5b7a8973df
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
pg4wp/driver_pgsql.php
View File

@@ -19,7 +19,7 @@
// Initializing some variables // Initializing some variables
$GLOBALS['pg4wp_version'] = '7.0'; $GLOBALS['pg4wp_version'] = '7.0';
$GLOBALS['pg4wp_result'] = 0; $GLOBALS['pg4wp_result'] = 0;
$GLOBALS['pg4wp_numrows'] = '10'; $GLOBALS['pg4wp_numrows_query'] = '';
$GLOBALS['pg4wp_ins_table'] = ''; $GLOBALS['pg4wp_ins_table'] = '';
$GLOBALS['pg4wp_ins_field'] = ''; $GLOBALS['pg4wp_ins_field'] = '';
$GLOBALS['pg4wp_connstr'] = ''; $GLOBALS['pg4wp_connstr'] = '';
@@ -142,7 +142,19 @@
$sql = str_replace('SQL_CALC_FOUND_ROWS', '', $sql); $sql = str_replace('SQL_CALC_FOUND_ROWS', '', $sql);
} }
elseif( false !== strpos($sql, 'FOUND_ROWS()')) elseif( false !== strpos($sql, 'FOUND_ROWS()'))
return $GLOBALS['pg4wp_numrows']; {
// Here we need to convert the latest query into a COUNT query
$sql = $GLOBALS['pg4wp_numrows_query'];
echo '<pre>'.$sql.'</pre>';
// Remove any LIMIT ... clause (this is the blocking part)
$pattern = '/\s+LIMIT.+/';
$sql = preg_replace( $pattern, '', $sql);
echo '<pre>'.$sql.'</pre>';
// Now add the COUNT() statement
$pattern = '/SELECT\s+([^\s]+)\s+(FROM.+)/';
$sql = preg_replace( $pattern, 'SELECT COUNT($1) $2', $sql);
echo '<pre>'.$sql.'</pre>';
}
// Handle COUNT(*)...ORDER BY... // Handle COUNT(*)...ORDER BY...
$sql = preg_replace( '/COUNT(.+)ORDER BY.+/', 'COUNT$1', $sql); $sql = preg_replace( '/COUNT(.+)ORDER BY.+/', 'COUNT$1', $sql);
@@ -387,9 +399,9 @@
if( $catchnumrows && $GLOBALS['pg4wp_result'] !== false) if( $catchnumrows && $GLOBALS['pg4wp_result'] !== false)
{ {
$GLOBALS['pg4wp_numrows'] = pg_num_rows( $GLOBALS['pg4wp_result']); $GLOBALS['pg4wp_numrows_query'] = $sql;
if( PG4WP_DEBUG) if( PG4WP_DEBUG)
error_log( "Catched number of rows for :\n$sql\nResult is :".$GLOBALS['pg4wp_numrows']."\n---------------------\n", 3, PG4WP_LOG.'pg4wp_NUMROWS.log'); error_log( "Number of rows required for :\n$sql\n---------------------\n", 3, PG4WP_LOG.'pg4wp_NUMROWS.log');
} }
return $GLOBALS['pg4wp_result']; return $GLOBALS['pg4wp_result'];
} }