improved BadQueryTest, simplified return value in BaseUtils::optimizeTable

Author: sneakyimp

system/Database/BaseUtils.php

@@ -136,12 +136,7 @@ public function optimizeTable(string $tableName)
 
 		$query = $this->db->query(sprintf($this->optimizeTable, $this->db->escapeIdentifiers($tableName)));
 
-		if ($query !== false)
-		{
-			return true;
-		}
-
-		return false;
+		return ($query !== false) ? true : false;
 	}
 
 	//--------------------------------------------------------------------

tests/system/Database/Live/BadQueryTest.php

@@ -13,10 +13,16 @@ class BadQueryTest extends CIDatabaseTestCase
 
 	public function testBadQuery()
 	{
-		// this throws an exception in this testing environment, but in production it'll return FALSE
-		// perhaps check $this->db->DBDebug for different test?
-		$query = $this->db->query('SELECT * FROM table_does_not_exist');
-		$this->assertEquals(false, $query);
+		if ($this->db->DBDebug) {
+			// expect an exception, class and message varies by DBMS
+			$this->expectException(\Exception::class);
+			$query = $this->db->query('SELECT * FROM table_does_not_exist');
+		} else {
+			// this throws an exception in this testing environment, but in production it'll return FALSE
+			// perhaps check $this->db->DBDebug for different test?
+			$query = $this->db->query('SELECT * FROM table_does_not_exist');
+			$this->assertEquals(false, $query);
+		}
 	}
 
 }