Merge pull request #2205 from MGatner/forge-prefix-trim

Fix empty() bug on DBPrefix

Author: MGatner

system/Database/Forge.php

@@ -605,7 +605,7 @@ public function dropTable(string $tableName, bool $ifExists = false, bool $casca
 		}
 
 		// If the prefix is already starting the table name, remove it...
-		if (! empty($this->db->DBPrefix) && strpos($tableName, $this->db->DBPrefix) === 0)
+		if ($this->db->DBPrefix && strpos($tableName, $this->db->DBPrefix) === 0)
 		{
 			$tableName = substr($tableName, strlen($this->db->DBPrefix));
 		}

system/Test/CIDatabaseTestCase.php

@@ -173,6 +173,7 @@ protected function setUp()
 			{
 				$this->migrations->setNamespace($this->namespace);
 			}
+			$this->migrations->regress(0, 'tests');
 
 			// Delete all of the tables to ensure we're at a clean start.
 			$tables = $this->db->listTables();
@@ -192,7 +193,6 @@ protected function setUp()
 				}
 			}
 
-			$this->migrations->regress(0, 'tests');
 			$this->migrations->latest('tests');
 		}