From 61cfa6896d7ac25fb82b2147aaf3e41205b91d1c Mon Sep 17 00:00:00 2001
From: Matthew Bucci <buccim2@gene.com>
Date: Wed, 21 Feb 2024 01:22:57 -0800
Subject: [PATCH] extract public to schema variable so we can use a constant
 later

---
 pg4wp/rewriters/DescribeSQLRewriter.php        | 5 +++--
 pg4wp/rewriters/SelectSQLRewriter.php          | 4 ++--
 pg4wp/rewriters/ShowFullColumnsSQLRewriter.php | 5 +++--
 pg4wp/rewriters/ShowTableStatusSQLRewriter.php | 4 ++--
 pg4wp/rewriters/ShowTablesSQLRewriter.php      | 3 ++-
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/pg4wp/rewriters/DescribeSQLRewriter.php b/pg4wp/rewriters/DescribeSQLRewriter.php
index 6b841c1..98dfb8c 100644
--- a/pg4wp/rewriters/DescribeSQLRewriter.php
+++ b/pg4wp/rewriters/DescribeSQLRewriter.php
@@ -28,9 +28,10 @@ class DescribeSQLRewriter extends AbstractSQLRewriter
      * Generates a PostgreSQL-compatible SQL query to mimic MySQL's "DESCRIBE".
      *
      * @param string $tableName The table name
+     * @param string $schema The schema name
      * @return string The generated SQL query
      */
-    public function generatePostgresDescribeTable($tableName)
+    public function generatePostgresDescribeTable($tableName, $schema = "public")
     {
         $sql = <<<SQL
             SELECT  
@@ -70,7 +71,7 @@ class DescribeSQLRewriter extends AbstractSQLRewriter
                 LEFT JOIN pg_constraint p ON p.conrelid = c.oid AND f.attnum = ANY (p.conkey)  
                 LEFT JOIN pg_class AS g ON p.confrelid = g.oid  
             WHERE c.relkind = 'r'::char  
-                AND n.nspname = 'public' 
+                AND n.nspname = '$schema' 
                 AND c.relname = '$tableName'
                 AND f.attnum > 0 ORDER BY number
         SQL;
diff --git a/pg4wp/rewriters/SelectSQLRewriter.php b/pg4wp/rewriters/SelectSQLRewriter.php
index e8e0e8a..d9ef394 100644
--- a/pg4wp/rewriters/SelectSQLRewriter.php
+++ b/pg4wp/rewriters/SelectSQLRewriter.php
@@ -358,7 +358,7 @@ class SelectSQLRewriter extends AbstractSQLRewriter
     }
 
     // This method is specifically to handle should_suggest_persistent_object_cache in wp site health
-    protected function postgresTableSizeRewrite() 
+    protected function postgresTableSizeRewrite($schema = 'public') 
     {
 
         $sql = <<<SQL
@@ -373,7 +373,7 @@ class SelectSQLRewriter extends AbstractSQLRewriter
         INNER JOIN 
             pg_stat_user_tables S ON (S.relid = C.oid) 
         WHERE 
-            N.nspname = 'public' AND 
+            N.nspname = $schema AND 
             C.relname IN ('wp_comments','wp_options','wp_posts','wp_terms','wp_users')
         GROUP BY 
             C.relname, pg_total_relation_size(C.oid), S.n_live_tup;
diff --git a/pg4wp/rewriters/ShowFullColumnsSQLRewriter.php b/pg4wp/rewriters/ShowFullColumnsSQLRewriter.php
index a6909a4..7d61729 100644
--- a/pg4wp/rewriters/ShowFullColumnsSQLRewriter.php
+++ b/pg4wp/rewriters/ShowFullColumnsSQLRewriter.php
@@ -28,9 +28,10 @@ class ShowFullColumnsSQLRewriter extends AbstractSQLRewriter
      * Generates a PostgreSQL-compatible SQL query to mimic MySQL's "SHOW FULL COLUMNS".
      *
      * @param string $tableName The table name
+     * @param string $schema The schema name
      * @return string The generated SQL query
      */
-    public function generatePostgresShowColumns($tableName)
+    public function generatePostgresShowColumns($tableName, $schema = "public")
     {
         $sql = <<<SQL
             SELECT 
@@ -62,7 +63,7 @@ class ShowFullColumnsSQLRewriter extends AbstractSQLRewriter
                     FROM pg_catalog.pg_class c
                     LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace
                     WHERE c.relname = '$tableName'
-                    AND n.nspname = 'public'
+                    AND n.nspname = '$schema'
                 )
             ORDER BY 
                 a.attnum;
diff --git a/pg4wp/rewriters/ShowTableStatusSQLRewriter.php b/pg4wp/rewriters/ShowTableStatusSQLRewriter.php
index 346d721..cf7ea68 100644
--- a/pg4wp/rewriters/ShowTableStatusSQLRewriter.php
+++ b/pg4wp/rewriters/ShowTableStatusSQLRewriter.php
@@ -24,9 +24,9 @@ class ShowTableStatusSQLRewriter extends AbstractSQLRewriter
             NULL AS Row_format,
             cls.reltuples AS Rows,
             NULL AS Avg_row_length,
-            pg_relation_size(cls.oid) AS Data_length,
+            pg_size_pretty(pg_relation_size(cls.oid)) AS Data_length,
             NULL AS Max_data_length,
-            pg_indexes_size(cls.oid) AS Index_length, 
+            pg_size_pretty(pg_indexes_size(cls.oid)) AS Index_length, 
             NULL AS Data_free,
             NULL AS Auto_increment,
             NULL AS Create_time,
diff --git a/pg4wp/rewriters/ShowTablesSQLRewriter.php b/pg4wp/rewriters/ShowTablesSQLRewriter.php
index 39bf255..bf423a1 100644
--- a/pg4wp/rewriters/ShowTablesSQLRewriter.php
+++ b/pg4wp/rewriters/ShowTablesSQLRewriter.php
@@ -4,6 +4,7 @@ class ShowTablesSQLRewriter extends AbstractSQLRewriter
 {
     public function rewrite(): string
     {
-        return 'SELECT tablename FROM pg_tables WHERE schemaname = \'public\';';
+        $schema = "public";
+        return 'SELECT tablename FROM pg_tables WHERE schemaname = \'$schema\';';
     }
 }