Get rid of some remaining hardcoded table prefix

git-svn-id: https://plugins.svn.wordpress.org/postgresql-for-wordpress/trunk@191290 b8457f37-d9ea-0310-8a92-e5e31aec5664
This commit is contained in:
hawk__
2010-01-07 23:06:14 +00:00
parent e2eda8850a
commit 91eca9bb41

View File

@@ -241,7 +241,7 @@
$sql = str_replace( "'0000-00-00 00:00:00'", 'now() AT TIME ZONE \'gmt\'', $sql); $sql = str_replace( "'0000-00-00 00:00:00'", 'now() AT TIME ZONE \'gmt\'', $sql);
// Multiple values group when calling INSERT INTO don't always work // Multiple values group when calling INSERT INTO don't always work
if( false !== strpos( $sql, 'wp_options') && false !== strpos( $sql, '), (')) if( false !== strpos( $sql, $table_prefix.'options') && false !== strpos( $sql, '), ('))
{ {
$pattern = '/INSERT INTO.+VALUES/'; $pattern = '/INSERT INTO.+VALUES/';
preg_match($pattern, $sql, $matches); preg_match($pattern, $sql, $matches);
@@ -431,7 +431,7 @@ WHERE pg_class.relname='$table_name' AND pg_attribute.attnum>=1 AND NOT pg_attri
} }
$GLOBALS['pg4wp_result'] = pg_query($sql); $GLOBALS['pg4wp_result'] = pg_query($sql);
if( PG4WP_DEBUG && $GLOBALS['pg4wp_result'] === false && $err = pg_last_error()) if( PG4WP_DEBUG && $GLOBALS['pg4wp_result'] === false && $err = pg_last_error())
if( false === strpos($err, 'relation "wp_options"')) if( false === strpos($err, 'relation "'.$table_prefix.'options"'))
error_log("Error running :\n$initial\n---- converted to ----\n$sql\n----\n$err\n---------------------\n", 3, PG4WP_LOG.'pg4wp_errors.log'); error_log("Error running :\n$initial\n---- converted to ----\n$sql\n----\n$err\n---------------------\n", 3, PG4WP_LOG.'pg4wp_errors.log');
return $GLOBALS['pg4wp_result']; return $GLOBALS['pg4wp_result'];