Reorganized directory structure

Added support for unix socket connections
Updated installation guide to reflect directory structure changes
Fixed a typo with zdMultiLang support 

git-svn-id: https://plugins.svn.wordpress.org/postgresql-for-wordpress/trunk@190706 b8457f37-d9ea-0310-8a92-e5e31aec5664
This commit is contained in:
hawk__
2010-01-06 22:50:15 +00:00
parent 4671aef93e
commit 5aad8c1dd7
3 changed files with 29 additions and 20 deletions

33
pg4wp/db.php Normal file
View File

@@ -0,0 +1,33 @@
<?php
/**
* @package PostgreSQL_For_Wordpress
* @version $Id$
* @author Hawk__, www.hawkix.net
*/
// You can choose the driver to load here
define('DB_DRIVER', 'pgsql'); // 'pgsql' or 'mysql' are supported for now
// This defines the directory where PG4WP files are
define( 'PG4WP_ROOT', dirname( __FILE__).'/plugins/pg4wp');
// Set this to 'true' and check that `pg4wp` is writable if you want debug logs to be written
define( 'PG4WP_DEBUG', false);
// Logs are put in the pg4wp directory
define( 'PG4WP_LOG', PG4WP_ROOT.'/logs/');
// Check if the logs directory is needed and exists or create it if possible
if( PG4WP_DEBUG &&
!file_exists( PG4WP_LOG) &&
is_writable(dirname( PG4WP_LOG)))
mkdir( PG4WP_LOG);
// Load the driver defined above
require_once( PG4WP_ROOT.'/driver_'.DB_DRIVER.'.php');
// This loads up the wpdb class applying the appropriate changes to it, DON'T TOUCH !
$replaces = array(
'mysql_' => 'wpsql_',
'<?php' => '',
'?>' => '',
);
eval( str_replace( array_keys($replaces), array_values($replaces), file_get_contents(ABSPATH.'/wp-includes/wp-db.php')));

View File

@@ -71,7 +71,7 @@
{ if( $GLOBALS['pg4wp_user'] == '') return pg_last_error(); else return ''; }
function wpsql_fetch_assoc($result) { return pg_fetch_assoc($result); }
function wpsql_escape_string($s) { return pg_escape_string($s); }
function wpsql_get_server_info() { return '4.1.0'; } // Just want to fool wordpress ...
function wpsql_get_server_info() { return '4.1.3'; } // Just want to fool wordpress ...
function wpsql_result($result, $i, $fieldname)
{ return pg_fetch_result($result, $i, $fieldname); }
@@ -89,7 +89,10 @@
$pg_user = $GLOBALS['pg4wp_user'];
$pg_password = $GLOBALS['pg4wp_password'];
$pg_server = $GLOBALS['pg4wp_server'];
$conn = pg_connect("host=$pg_server user=$pg_user password=$pg_password dbname=$dbname");
if( empty( $pg_server))
$conn = pg_connect("user=$pg_user password=$pg_password dbname=$dbname");
else
$conn = pg_connect("host=$pg_server user=$pg_user password=$pg_password dbname=$dbname");
// Now we should be connected, we "forget" about the connection parameters
$GLOBALS['pg4wp_user'] = '';
$GLOBALS['pg4wp_password'] = '';
@@ -223,7 +226,7 @@
if( $GLOBALS['pg4wp_ins_table'] == $table_prefix.'zd_ml_trans')
{
preg_match( '/VALUES \([^\d]*(\d+)', $sql, $matches);
$GLOBALS['pg4wp_insid'] = $match[1];
$GLOBALS['pg4wp_insid'] = $matches[1];
}
// Fix inserts into wp_categories