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-01 04:11:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Call wpsql_select_db from wpsql_connect

Browse Source 
Rather than calling pg_connect directly, call wpsql_select_db with the
best guess at the database name.  This sets $GLOBALS['pg4wp_conn'] and avoids reconnecting whenever the guess is correct.

Signed-off-by: Kevin Locke <kevin@kevinlocke.name>
This commit is contained in:
Kevin Locke
2016-08-22 17:25:22 -06:00
parent 5f6e9200c0
commit 650f768e69
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pg4wp/driver_pgsql.php
View File

@ -80,8 +80,10 @@
wp_die( 'Connecting to your PostgreSQL database without a password is considered insecure. wp_die( 'Connecting to your PostgreSQL database without a password is considered insecure.
<br />If you want to do it anyway, please set "PG4WP_INSECURE" to true in your "db.php" file.' ); <br />If you want to do it anyway, please set "PG4WP_INSECURE" to true in your "db.php" file.' );
// as of WordPress 4.6, a true resource must be returned // PostgreSQL must connect to a specific database (unlike MySQL)
return pg_connect( $GLOBALS['pg4wp_connstr'].' dbname=template1'); // Guess at one here and reconnect as required in wpsql_select_db
$dbname = defined('DB_NAME') && DB_NAME ? DB_NAME : 'template1';
return wpsql_select_db( $dbname);
} }
// The effective connection happens here // The effective connection happens here
@ -89,6 +91,7 @@
{ {
$pg_connstr = $GLOBALS['pg4wp_connstr'].' dbname='.$dbname; $pg_connstr = $GLOBALS['pg4wp_connstr'].' dbname='.$dbname;
// Note: pg_connect returns existing connection for same connstr
$GLOBALS['pg4wp_conn'] = pg_connect($pg_connstr); $GLOBALS['pg4wp_conn'] = pg_connect($pg_connstr);
if( $GLOBALS['pg4wp_conn']) if( $GLOBALS['pg4wp_conn'])