From 36726124a4eee3fdf5d1f52e1f22a183e53af127 Mon Sep 17 00:00:00 2001
From: Matthew Bucci <buccim2@gene.com>
Date: Fri, 18 Oct 2024 23:07:05 -0700
Subject: [PATCH 1/2] swap hardcoded public values for DB_SCHEMA constant

---
 pg4wp/db.php                                  |  5 +++++
 pg4wp/rewriters/DescribeSQLRewriter.php       |  4 ++--
 pg4wp/rewriters/SelectSQLRewriter.php         |  4 ++--
 .../rewriters/ShowFullColumnsSQLRewriter.php  |  4 ++--
 .../rewriters/ShowTableStatusSQLRewriter.php  |  4 ++--
 pg4wp/rewriters/ShowTablesSQLRewriter.php     |  2 +-
 readme.md                                     | 19 +++++++++++++++++++
 7 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/pg4wp/db.php b/pg4wp/db.php
index b5cca53..5dd9067 100644
--- a/pg4wp/db.php
+++ b/pg4wp/db.php
@@ -49,6 +49,11 @@
         mkdir(PG4WP_LOG);
     }
 
+    // Default to public schema
+    if (!defined('DB_SCHEMA')) {
+        define('DB_SCHEMA', 'public');
+    }
+
     // Here happens all the magic
     require_once(PG4WP_ROOT . '/core.php');
 } // Protection against multiple loading
diff --git a/pg4wp/rewriters/DescribeSQLRewriter.php b/pg4wp/rewriters/DescribeSQLRewriter.php
index 98dfb8c..5f39205 100644
--- a/pg4wp/rewriters/DescribeSQLRewriter.php
+++ b/pg4wp/rewriters/DescribeSQLRewriter.php
@@ -6,7 +6,7 @@ public function rewrite(): string
     {
         $sql = $this->original();
         $table = $this->extractTableName($sql);
-        return $this->generatePostgresDescribeTable($table);
+        return $this->generatePostgresDescribeTable($table, DB_SCHEMA);
     }
 
     /**
@@ -31,7 +31,7 @@ protected function extractTableName($sql)
      * @param string $schema The schema name
      * @return string The generated SQL query
      */
-    public function generatePostgresDescribeTable($tableName, $schema = "public")
+    public function generatePostgresDescribeTable($tableName, $schema)
     {
         $sql = <<<SQL
             SELECT  
diff --git a/pg4wp/rewriters/SelectSQLRewriter.php b/pg4wp/rewriters/SelectSQLRewriter.php
index 7f8899d..649de72 100644
--- a/pg4wp/rewriters/SelectSQLRewriter.php
+++ b/pg4wp/rewriters/SelectSQLRewriter.php
@@ -37,7 +37,7 @@ public function rewrite(): string
         if(false !== strpos($sql, 'information_schema')) {
             // WP Site Health rewrites
             if (false !== strpos($sql, "SELECT TABLE_NAME AS 'table', TABLE_ROWS AS 'rows', SUM(data_length + index_length)")) {
-                $sql = $this->postgresTableSizeRewrite();
+                $sql = $this->postgresTableSizeRewrite(DB_SCHEMA);
                 return $sql;
             }
 
@@ -373,7 +373,7 @@ protected function convertToPostgresLimitSyntax($sql)
     }
 
     // This method is specifically to handle should_suggest_persistent_object_cache in wp site health
-    protected function postgresTableSizeRewrite($schema = 'public')
+    protected function postgresTableSizeRewrite($schema)
     {
 
         $sql = <<<SQL
diff --git a/pg4wp/rewriters/ShowFullColumnsSQLRewriter.php b/pg4wp/rewriters/ShowFullColumnsSQLRewriter.php
index 7d61729..edd6e86 100644
--- a/pg4wp/rewriters/ShowFullColumnsSQLRewriter.php
+++ b/pg4wp/rewriters/ShowFullColumnsSQLRewriter.php
@@ -6,7 +6,7 @@ public function rewrite(): string
     {
         $sql = $this->original();
         $table = $this->extractTableNameFromShowColumns($sql);
-        return $this->generatePostgresShowColumns($table);
+        return $this->generatePostgresShowColumns($table, DB_SCHEMA);
     }
 
     /**
@@ -31,7 +31,7 @@ protected function extractTableNameFromShowColumns($sql)
      * @param string $schema The schema name
      * @return string The generated SQL query
      */
-    public function generatePostgresShowColumns($tableName, $schema = "public")
+    public function generatePostgresShowColumns($tableName, $schema)
     {
         $sql = <<<SQL
             SELECT 
diff --git a/pg4wp/rewriters/ShowTableStatusSQLRewriter.php b/pg4wp/rewriters/ShowTableStatusSQLRewriter.php
index 489afe2..161763c 100644
--- a/pg4wp/rewriters/ShowTableStatusSQLRewriter.php
+++ b/pg4wp/rewriters/ShowTableStatusSQLRewriter.php
@@ -5,7 +5,7 @@ class ShowTableStatusSQLRewriter extends AbstractSQLRewriter
     public function rewrite(): string
     {
         $sql = $this->original();
-        return $this->generatePostgresShowTableStatus();
+        return $this->generatePostgresShowTableStatus(DB_SCHEMA);
     }
 
 
@@ -14,7 +14,7 @@ public function rewrite(): string
      *
      * @return string The generated SQL query
      */
-    public function generatePostgresShowTableStatus($schema = "public")
+    public function generatePostgresShowTableStatus($schema)
     {
         $sql = <<<SQL
         SELECT 
diff --git a/pg4wp/rewriters/ShowTablesSQLRewriter.php b/pg4wp/rewriters/ShowTablesSQLRewriter.php
index bf423a1..f7317be 100644
--- a/pg4wp/rewriters/ShowTablesSQLRewriter.php
+++ b/pg4wp/rewriters/ShowTablesSQLRewriter.php
@@ -4,7 +4,7 @@ class ShowTablesSQLRewriter extends AbstractSQLRewriter
 {
     public function rewrite(): string
     {
-        $schema = "public";
+        $schema = DB_SCHEMA;
         return 'SELECT tablename FROM pg_tables WHERE schemaname = \'$schema\';';
     }
 }
diff --git a/readme.md b/readme.md
index de62e1a..4318423 100644
--- a/readme.md
+++ b/readme.md
@@ -68,6 +68,25 @@ This is because the database needs to be up and running before any plugin can be
 
 1.	Point your Web Browser to your WordPress installation and go through the traditional WordPress installation routine.
 
+wp-config constants you can set
+```
+// ** Database settings - You can get this info from your web host ** //
+/** The name of the database for WordPress */
+define( 'DB_NAME', 'database_name_here' );
+
+/** Database username */
+define( 'DB_USER', 'username_here' );
+
+/** Database password */
+define( 'DB_PASSWORD', 'password_here' );
+
+/** Database hostname */
+define( 'DB_HOST', 'localhost' );
+
+/** PG4WP specific Database schema / search path */
+define( 'DB_SCHEMA', 'public' );
+```
+
 
 ### Contributing
 

From 3af0cc5f51dc2f90cb3d9f6f3ae3c878d8fdd08c Mon Sep 17 00:00:00 2001
From: Matthew Bucci <buccim2@gene.com>
Date: Fri, 18 Oct 2024 23:13:25 -0700
Subject: [PATCH 2/2] set default schema when connecting

---
 pg4wp/driver_pgsql.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pg4wp/driver_pgsql.php b/pg4wp/driver_pgsql.php
index ac83d76..b44af89 100644
--- a/pg4wp/driver_pgsql.php
+++ b/pg4wp/driver_pgsql.php
@@ -105,6 +105,9 @@ function wpsqli_real_connect(&$connection, $hostname = null, $username = null, $
     $pg_connstr = $GLOBALS['pg4wp_connstr'] . ' dbname=' . $dbname;
     $GLOBALS['pg4wp_conn'] = $connection = pg_connect($pg_connstr);
 
+    // Set the default schema
+    pg_query($connection, 'SET search_path TO ' . pg_escape_literal(DB_SCHEMA));
+
     return $connection;
 }