fixing up errors with DBPrefix getting applied multiple times. Fixes #…

…149
codeigniter4 · Jul 8, 2016 · e928bde · e928bde
1 parent 3562895
commit e928bde
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 17 deletions.
diff --git a/application/Config/Database.php b/application/Config/Database.php
@@ -64,7 +64,7 @@ class Database extends \CodeIgniter\Database\Config
 		'password'     => '',
 		'database'     => '',
 		'DBDriver'     => '',
-		'DBPrefix'     => '',
+		'DBPrefix'     => 'db_',  // Needed to ensure we're working correctly with prefixes live. DO NOT REMOVE.
 		'pConnect'     => false,
 		'DBDebug'     => (ENVIRONMENT !== 'production'),
 		'cacheOn'     => false,
@@ -93,7 +93,7 @@ public function __construct()
 			$this->defaultGroup = 'tests';
 
 			// Under Travis-CI, we can set an ENV var named 'DB_GROUP'
-			// so that we can test against multiple databases. 
+			// so that we can test against multiple databases.
 			if ($group = getenv('DB_GROUP'))
 			{
 				if (is_file(TESTPATH.'travis/Database.php'))

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
@@ -2,7 +2,7 @@
 
 /**
  * CodeIgniter
- * 
+ *
  * An open source application development framework for PHP
  *
  * This content is released under the MIT License (MIT)
@@ -198,7 +198,7 @@ class BaseBuilder
 
 	/**
 	 * Constructor
-	 * 
+	 *
 	 * @param type $tableName
 	 * @param \CodeIgniter\Database\ConnectionInterface $db
 	 * @param array $options
@@ -213,7 +213,6 @@ public function __construct($tableName, ConnectionInterface &$db, array $options
 
 		$this->db = $db;
 
-		$this->trackAliases($tableName);
 		$this->from($tableName);
 
 		if (count($options))
@@ -1737,8 +1736,6 @@ protected function _insert($table, array $keys, array $unescapedKeys)
 	 *
 	 * @return bool TRUE on success, FALSE on failure
 	 * @throws DatabaseException
-	 * @internal param true $bool returns the generated SQL, false executes the query.
-	 *
 	 */
 	public function replace($set = null, $returnSQL = false)
 	{
@@ -2243,7 +2240,7 @@ public function delete($where = '', $limit = null, $reset_data = true, $returnSQ
 		{
 			$sql = $this->_limit($sql);
 		}
-		
+
 		if ($reset_data)
 		{
 			$this->resetWrite();

diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
@@ -842,6 +842,11 @@ public function protectIdentifiers($item, $prefixSingle = false, $protectIdentif
 			return $item.$alias;
 		}
 
+		// In some cases, especially 'from', we end up running through
+		// protect_identifiers twice. This algorithm won't work when
+		// it contains the escapeChar so strip it out.
+		$item = trim($item, $this->escapeChar);
+
 		// Is there a table prefix? If not, no need to insert it
 		if ($this->DBPrefix !== '')
 		{

diff --git a/tests/system/Database/Builder/SelectTest.php b/tests/system/Database/Builder/SelectTest.php
@@ -6,16 +6,16 @@
 class SelectTest extends \CIUnitTestCase
 {
 	protected $db;
-	
+
 	//--------------------------------------------------------------------
-	
-	public function setUp() 
+
+	public function setUp()
 	{
 	    $this->db = new MockConnection([]);
 	}
-	
+
 	//--------------------------------------------------------------------
-	
+
 	public function testSimpleSelect()
 	{
 	    $builder = new BaseBuilder('users', $this->db);
@@ -24,7 +24,7 @@ public function testSimpleSelect()
 
 		$this->assertEquals($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
 	}
-	
+
 	//--------------------------------------------------------------------
 
 	public function testSelectOnlyOneColumn()

diff --git a/tests/system/Database/Live/InsertTest.php b/tests/system/Database/Live/InsertTest.php
@@ -34,7 +34,7 @@ public function testInsertBatch()
 	}
 
 	//--------------------------------------------------------------------
-	
+
 	public function testReplaceWithNoMatchingData()
 	{
 		$data = array('id' => 5, 'name' => 'Cab Driver', 'description' => 'Iam yellow');

diff --git a/tests/travis/Database.php b/tests/travis/Database.php
@@ -9,7 +9,7 @@
 		'password'     => '',
 		'database'     => 'test',
 		'DBDriver'     => 'MySQLi',
-		'DBPrefix'     => '',
+		'DBPrefix'     => 'db_',
 		'pConnect'     => false,
 		'DBDebug'     => (ENVIRONMENT !== 'production'),
 		'cacheOn'     => false,
@@ -31,7 +31,7 @@
 	    'password'     => '',
 	    'database'     => 'test',
 	    'DBDriver'     => 'Postgre',
-	    'DBPrefix'     => '',
+	    'DBPrefix'     => 'db_',
 	    'pConnect'     => false,
 	    'DBDebug'     => (ENVIRONMENT !== 'production'),
 	    'cacheOn'     => false,
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,7 +34,7 @@ public function testInsertBatch() @@
     	}
     	//--------------------------------------------------------------------
     	public function testReplaceWithNoMatchingData()
     	{
     		$data = array('id' => 5, 'name' => 'Cab Driver', 'description' => 'Iam yellow');
@@ Expand Down @@