diff --git a/pg4wp/driver_pgsql.php b/pg4wp/driver_pgsql.php index 809f0d2..715aa95 100644 --- a/pg4wp/driver_pgsql.php +++ b/pg4wp/driver_pgsql.php @@ -122,13 +122,21 @@ return true; } + $initial = $sql; $sql = pg4wp_rewrite( $sql); $GLOBALS['pg4wp_result'] = pg_query($sql); if( (PG4WP_DEBUG || PG4WP_LOG_ERRORS) && $GLOBALS['pg4wp_result'] === false && $err = pg_last_error()) - if( false === strpos($err, 'relation "'.$wpdb->options.'"')) - error_log("Error running :\n$initial\n---- converted to ----\n$sql\n----\n$err\n---------------------\n", 3, PG4WP_LOG.'pg4wp_errors.log'); - + { + $ignore = false; + if( defined('WP_INSTALLING') && WP_INSTALLING) + { + global $table_prefix; + $ignore = strpos($err, 'relation "'.$table_prefix.'options"'); + } + if( ! $ignore ) + error_log('['.microtime(true)."] Error running :\n$initial\n---- converted to ----\n$sql\n----> $err\n---------------------\n", 3, PG4WP_LOG.'pg4wp_errors.log'); + } return $GLOBALS['pg4wp_result']; } @@ -151,7 +159,7 @@ $res = pg_query($sql); $data = pg_fetch_result($res, 0, 0); if( PG4WP_DEBUG && $sql) - error_log("Getting inserted ID for '$t' : $sql => $data\n", 3, PG4WP_LOG.'pg4wp_insertid.log'); + error_log( '['.microtime(true)."] Getting inserted ID for '$t' : $sql => $data\n", 3, PG4WP_LOG.'pg4wp_insertid.log'); return $data; } @@ -175,7 +183,7 @@ $sql = str_replace('SQL_CALC_FOUND_ROWS', '', $sql); $GLOBALS['pg4wp_numrows_query'] = $sql; if( PG4WP_DEBUG) - error_log( "Number of rows required for :\n$sql\n---------------------\n", 3, PG4WP_LOG.'pg4wp_NUMROWS.log'); + error_log( '['.microtime(true)."] Number of rows required for :\n$sql\n---------------------\n", 3, PG4WP_LOG.'pg4wp_NUMROWS.log'); } elseif( false !== strpos($sql, 'FOUND_ROWS()')) { @@ -419,9 +427,9 @@ if( PG4WP_DEBUG) { if( $initial != $sql) - error_log("Converting :\n$initial\n---- to ----\n$sql\n---------------------\n", 3, PG4WP_LOG.'pg4wp_'.$logto.'.log'); + error_log( '['.microtime(true)."] Converting :\n$initial\n---- to ----\n$sql\n---------------------\n", 3, PG4WP_LOG.'pg4wp_'.$logto.'.log'); else - error_log("$sql\n---------------------\n", 3, PG4WP_LOG.'pg4wp_unmodified.log'); + error_log( '['.microtime(true)."] $sql\n---------------------\n", 3, PG4WP_LOG.'pg4wp_unmodified.log'); } return $sql; }