From 57879ef3baa37f83fad9d165ff1f09ef85424dbb Mon Sep 17 00:00:00 2001
From: hawk__ <hawk__@b8457f37-d9ea-0310-8a92-e5e31aec5664>
Date: Wed, 24 Aug 2011 20:57:55 +0000
Subject: [PATCH] Removed all references to ZdMultilang hacks 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
---
 pg4wp/driver_pgsql.php         | 56 +++++++++-------------------------
 pg4wp/driver_pgsql_install.php |  9 ------
 2 files changed, 14 insertions(+), 51 deletions(-)

diff --git a/pg4wp/driver_pgsql.php b/pg4wp/driver_pgsql.php
index e9da08d..206f1a4 100644
--- a/pg4wp/driver_pgsql.php
+++ b/pg4wp/driver_pgsql.php
@@ -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;
 		
diff --git a/pg4wp/driver_pgsql_install.php b/pg4wp/driver_pgsql_install.php
index dd84da1..953c1d1 100644
--- a/pg4wp/driver_pgsql_install.php
+++ b/pg4wp/driver_pgsql_install.php
@@ -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)