From 37ac9f68b5447694820fb2f5fe94523ceb9fed89 Mon Sep 17 00:00:00 2001
From: Benn Oshrin <boshrin@users.noreply.github.com>
Date: Wed, 7 Feb 2024 07:20:42 -0500
Subject: [PATCH] SqlProvisioner bug fixes (CFM-74)

---
 .../SqlConnector/src/Model/Table/SqlProvisionersTable.php  | 7 +++++--
 app/plugins/CoreServer/src/Model/Table/SqlServersTable.php | 3 +++
 app/src/Lib/Util/SchemaManager.php                         | 3 +++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/availableplugins/SqlConnector/src/Model/Table/SqlProvisionersTable.php b/app/availableplugins/SqlConnector/src/Model/Table/SqlProvisionersTable.php
index fe01da0fb..578e1e14e 100644
--- a/app/availableplugins/SqlConnector/src/Model/Table/SqlProvisionersTable.php
+++ b/app/availableplugins/SqlConnector/src/Model/Table/SqlProvisionersTable.php
@@ -332,8 +332,11 @@ public function applySchema($id) {
    */
     
   public function localAfterSave(\Cake\Event\EventInterface $event, \Cake\Datasource\EntityInterface $entity, \ArrayObject $options): bool {
-    // We may not have a Server configuration yet on first save
-    if(!empty($spcfg->server_id)) {
+    // We may not have a Server configuration yet on first save.
+
+    // Also, When the SQL Provisioner is deleted, neither the
+    // database schema nor reference data is touched (PAR-SqlProvisioner-4).
+    if(!empty($entity->server_id) && !$entity->deleted) {
       // Apply the database schema (PAR-SqlProvisioner-1)
       $this->llog('rule', "PAR-SqlProvisioner-1 Applying database schema for SqlProvisioner " . $entity->id);
       $this->applySchema($entity->id);
diff --git a/app/plugins/CoreServer/src/Model/Table/SqlServersTable.php b/app/plugins/CoreServer/src/Model/Table/SqlServersTable.php
index 205453b8e..f4d9851fc 100644
--- a/app/plugins/CoreServer/src/Model/Table/SqlServersTable.php
+++ b/app/plugins/CoreServer/src/Model/Table/SqlServersTable.php
@@ -133,6 +133,9 @@ public function connect(int $serverId, string $name): bool {
       'timezone'          => 'UTC'
     ];
 
+    // We need to drop the existing configuration before we can reconfigure it
+    ConnectionManager::drop('targetdb');
+
     ConnectionManager::setConfig('targetdb', $dbconfig);
 
     return true;
diff --git a/app/src/Lib/Util/SchemaManager.php b/app/src/Lib/Util/SchemaManager.php
index 1819ecf86..dabc5d8f9 100644
--- a/app/src/Lib/Util/SchemaManager.php
+++ b/app/src/Lib/Util/SchemaManager.php
@@ -93,6 +93,9 @@ public function __construct(?ConsoleIo $io=null, string $connection='default') {
       $cfargs['ssl_ca'] = $cfg['ssl_ca'];
     }
     
+    if($this->io) $this->io->out("Connecting to database " . $cfg['database'] . " as " 
+                                  . $cfg['username'] . "@" . $cfg['host']);
+    
     $this->conn = DriverManager::getConnection($cfargs, $config);
     $this->driver = $cfg['driver'];
   }