PostgreSQL-For-Wordpress/postgresql-for-wordpress
1
0
Fork 1
mirror of https://github.com/PostgreSQL-For-Wordpress/postgresql-for-wordpress.git synced 2025-07-29 17:27:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Removed all references to ZdMultilang hacks

Browse Source 
Added YEAR and MONTH to 'INTERVAL...' handling
Added a handle for correct counting of users and roles

git-svn-id: https://plugins.svn.wordpress.org/postgresql-for-wordpress/trunk@428351 b8457f37-d9ea-0310-8a92-e5e31aec5664
This commit is contained in:
hawk__
2011-08-24 20:57:55 +00:00
parent 2c552ff24b
commit 57879ef3ba
2 changed files with 14 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
pg4wp/driver_pgsql.php
View File

@ -146,6 +146,17 @@
// Handle COUNT(*)...ORDER BY...
$sql = preg_replace( '/COUNT(.+)ORDER BY.+/', 'COUNT$1', $sql);
// In order for users counting to work...
$matches = array();
if( preg_match_all( '/COUNT[^C]+\),/',$sql, $matches))
{
foreach( $matches[0] as $num => $one)
{
$sub = substr( $one, 0, -1);
$sql = str_replace( $sub, $sub.' AS count'.$num, $sql);
}
}
$pattern = '/LIMIT[ ]+(\d+),[ ]*(\d+)/';
$sql = preg_replace($pattern, 'LIMIT $2 OFFSET $1', $sql);
@ -186,13 +197,6 @@
// HB : timestamp fix for permalinks
$sql = str_replace( 'post_date_gmt > 1970', 'post_date_gmt > to_timestamp (\'1970\')', $sql);
/****
// ZdMultiLang support hacks
$sql = preg_replace( '/post_type="([^"]+)"/', 'post_type=\'$1\'', $sql);
$sql = str_replace( 'link_url o_url', 'link_url AS o_url', $sql);
$sql = str_replace( 'link_name o_name', 'link_name AS o_name', $sql);
$sql = str_replace( 'link_description o_desc', 'link_description AS o_desc', $sql);
****/
} // SELECT
elseif( 0 === strpos($sql, 'UPDATE'))
{
@ -221,15 +225,6 @@
$sql = str_replace('(0,',"('0',", $sql);
$sql = str_replace('(1,',"('1',", $sql);
/****
// ZdMultiLang support hack
if( $GLOBALS['pg4wp_ins_table'] == $wpdb->prefix.'zd_ml_trans')
{
preg_match( '/VALUES \([^\d]*(\d+)', $sql, $matches);
$GLOBALS['pg4wp_insid'] = $matches[1];
}
****/
// Fix inserts into wp_categories
if( false !== strpos($sql, 'INSERT INTO '.$wpdb->prefix.'categories'))
{
@ -307,9 +302,9 @@
// WP 2.9.1 uses a comparison where text data is not quoted
$pattern = '/AND meta_value = (-?\d+)/';
$sql = preg_replace( $pattern, 'AND meta_value = \'$1\'', $sql);
// Generic "INTERVAL xx DAY|HOUR|MINUTE|SECOND" handle
$pattern = '/INTERVAL[ ]+(\d+)[ ]+(DAY|HOUR|MINUTE|SECOND)/';
// Generic "INTERVAL xx YEAR|MONTH|DAY|HOUR|MINUTE|SECOND" handler
$pattern = '/INTERVAL[ ]+(\d+)[ ]+(YEAR|MONTH|DAY|HOUR|MINUTE|SECOND)/';
$sql = preg_replace( $pattern, "'\$1 \$2'::interval", $sql);
$pattern = '/DATE_SUB[ ]*\(([^,]+),([^\)]+)\)/';
$sql = preg_replace( $pattern, '($1::timestamp - $2)', $sql);
@ -347,23 +342,6 @@
$sql = str_replace( 'IN ( \'\' )', 'IN (NULL)', $sql);
$sql = str_replace( 'IN ()', 'IN (NULL)', $sql);
/****
// ZdMultiLang 1.2.4 uses a lowercase 'in'
$sql = str_replace( 'in ()', 'IN (NULL)', $sql);
// ZdMultiLang support hack, some columns have capitals in their name, and that needs special handling for PostgreSQL
if( false !== strpos( $sql, $wpdb->prefix.'zd_ml_langs'))
{
$zdml_conv = array(
'LanguageName' => '"LanguageName"',
'LangPermalink' => '"LangPermalink"',
'BlogName' => '"BlogName"',
'BlogDescription' => '"BlogDescription"',
);
$sql = str_replace( array_keys($zdml_conv), array_values($zdml_conv), $sql);
}
****/
// For insert ID catching
if( $logto == 'INSERT')
{
@ -411,12 +389,6 @@
$tbls = split("\n", $GLOBALS['pg4wp_ins_table']); // Workaround for bad tablename
$t = $tbls[0] . '_seq';
/****
// ZdMultiLang support hack
if( $tbls[0] == $wpdb->prefix.'zd_ml_trans')
return $GLOBALS['pg4wp_insid'];
****/
if( in_array( $t, array( '_seq', $wpdb->prefix.'term_relationships_seq')))
return 0;

9
pg4wp/driver_pgsql_install.php
View File

@ -25,15 +25,6 @@
// WP 2.7.1 compatibility
'int(4)' => 'smallint',
/****
// ZdMultiLang support hack
'term_id varchar(5)' => 'term_id int',
'BIGINT(20)' => 'int',
'character set utf8' => '',
'CHARACTER SET utf8' => '',
'UNSIGNED' => '', // ZdMultilang 1.2.5
****/
);
function pg4wp_installing( $sql, &$logto)