From 5644761e178faba64c38cdce1f814ba89beee2a2 Mon Sep 17 00:00:00 2001 From: hawk__ Date: Sat, 27 Aug 2011 00:34:15 +0000 Subject: [PATCH] Improved SHOW INDEX for upgrades to detect indices correctly and so don't try to recreate them git-svn-id: https://plugins.svn.wordpress.org/postgresql-for-wordpress/trunk@429283 b8457f37-d9ea-0310-8a92-e5e31aec5664 --- pg4wp/driver_pgsql_install.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pg4wp/driver_pgsql_install.php b/pg4wp/driver_pgsql_install.php index e39b6b0..818dd5c 100644 --- a/pg4wp/driver_pgsql_install.php +++ b/pg4wp/driver_pgsql_install.php @@ -29,7 +29,7 @@ function pg4wp_installing( $sql, &$logto) { - global $table_prefix; + global $wpdb; // SHOW INDEX emulation if( 0 === strpos( $sql, 'SHOW INDEX')) @@ -40,7 +40,8 @@ $table = $matches[1]; $sql = 'SELECT bc.relname AS "Table", CASE WHEN i.indisunique THEN \'0\' ELSE \'1\' END AS "Non_unique", - CASE WHEN i.indisprimary THEN \'PRIMARY\' WHEN bc.relname LIKE \'%usermeta\' AND ic.relname = \'umeta_key\' THEN \'meta_key\' ELSE ic.relname END AS "Key_name", + CASE WHEN i.indisprimary THEN \'PRIMARY\' WHEN bc.relname LIKE \'%usermeta\' AND ic.relname = \'umeta_key\' + THEN \'meta_key\' ELSE REPLACE( ic.relname, \''.$table.'_\', \'\') END AS "Key_name", a.attname AS "Column_name", NULL AS "Sub_part" FROM pg_class bc, pg_class ic, pg_index i, pg_attribute a