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-30 17:57:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Reworked wpsql_insert_id() for better report of errors

Browse Source 
git-svn-id: https://plugins.svn.wordpress.org/postgresql-for-wordpress/trunk@546724 b8457f37-d9ea-0310-8a92-e5e31aec5664
This commit is contained in:
hawk__
2012-05-20 21:57:33 +00:00
parent 9120c5fec2
commit 78e876dec0
1 changed files with 33 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
pg4wp/driver_pgsql.php
View File

@ -144,26 +144,41 @@
return $GLOBALS['pg4wp_result']; return $GLOBALS['pg4wp_result'];
} }
function wpsql_insert_id($table) function wpsql_insert_id($lnk = NULL)
{ {
global $wpdb; global $wpdb;
$ins_field = $GLOBALS['pg4wp_ins_field']; $ins_field = $GLOBALS['pg4wp_ins_field'];
$table = $GLOBALS['pg4wp_ins_table'];
$tbls = split("\n", $GLOBALS['pg4wp_ins_table']); // Workaround for bad tablename $seq = $table . '_seq';
$t = $tbls[0] . '_seq';
if( in_array( $t, array( '_seq', $wpdb->prefix.'term_relationships_seq'))) // Table 'term_relationships' doesn't have a sequence
return 0; if( $table == $wpdb->term_relationships || 'post_author' == $ins_field)
{
if( $ins_field == '"cat_ID"' || $ins_field == 'rel_id' || $ins_field == 'term_id') $sql = 'NO QUERY';
$sql = "SELECT MAX($ins_field) FROM ".$tbls[0]; $data = 0;
}
else else
$sql = "SELECT CURRVAL('$t')"; {
$sql = "SELECT CURRVAL('$seq')";
$res = pg_query($sql);
$data = pg_fetch_result($res, 0, 0); $res = pg_query($sql);
if( false !== $res)
$data = pg_fetch_result($res, 0, 0);
elseif( PG4WP_DEBUG || PG4WP_ERROR_LOG)
{
if( PG4WP_DEBUG)
$lastq = $GLOBALS['pg4wp_last_insert'];
else
$lastq = 'UNKNOWN';
$log = '['.microtime(true)."] wpsql_insert_id() was called with '$table' and '$ins_field'".
" and generated an error. The latest INSERT query was :\n'$lastq'\n";
error_log( $log, 3, PG4WP_LOG.'pg4wp_errors.log');
}
}
if( PG4WP_DEBUG && $sql) if( PG4WP_DEBUG && $sql)
error_log( '['.microtime(true)."] Getting inserted ID for '$t' : $sql => $data\n", 3, PG4WP_LOG.'pg4wp_insertid.log'); error_log( '['.microtime(true)."] Getting inserted ID for '$table' ('$ins_field') : $sql => $data\n", 3, PG4WP_LOG.'pg4wp_insertid.log');
return $data; return $data;
} }
@ -423,6 +438,9 @@
$sql = str_replace( 'IN ( \'\' )', 'IN (NULL)', $sql); $sql = str_replace( 'IN ( \'\' )', 'IN (NULL)', $sql);
$sql = str_replace( 'IN ()', 'IN (NULL)', $sql); $sql = str_replace( 'IN ()', 'IN (NULL)', $sql);
// Put back the end of the query if it was separated
$sql .= $end;
// For insert ID catching // For insert ID catching
if( $logto == 'INSERT') if( $logto == 'INSERT')
{ {
@ -436,11 +454,10 @@
if(! $GLOBALS['pg4wp_ins_field']) if(! $GLOBALS['pg4wp_ins_field'])
$GLOBALS['pg4wp_ins_field'] = trim($match_list[4],' () '); $GLOBALS['pg4wp_ins_field'] = trim($match_list[4],' () ');
} }
if( PG4WP_DEBUG)
$GLOBALS['pg4wp_last_insert'] = $sql;
} }
// Put back the end of the query if it was separated
$sql .= $end;
// Correct quoting for PostgreSQL 9.1+ compatibility // Correct quoting for PostgreSQL 9.1+ compatibility
$sql = str_replace( "\\'", "''", $sql); $sql = str_replace( "\\'", "''", $sql);
$sql = str_replace( '\"', '"', $sql); $sql = str_replace( '\"', '"', $sql);