fix bug with prefix on migration table.

taylorotwell · taylorotwell · commit abcacab80109 · 2013-01-11T13:46:43.000-06:00
diff --git a/src/Illuminate/Database/Connection.php b/src/Illuminate/Database/Connection.php
@@ -641,6 +641,16 @@ public function setDatabaseName($database)
 		$this->database = $database;
 	}
 
+	/**
+	 * Get the table prefix for the connection.
+	 *
+	 * @return string
+	 */
+	public function getTablePrefix()
+	{
+		return $this->tablePrefix;
+	}
+
 	/**
 	 * Set the table prefix and return the grammar.
 	 *
diff --git a/src/Illuminate/Database/Schema/Builder.php b/src/Illuminate/Database/Schema/Builder.php
@@ -42,6 +42,8 @@ public function hasTable($table)
 	{
 		$sql = $this->grammar->compileTableExists();
 
+		$table = $this->connection->getTablePrefix().$table;
+
 		return count($this->connection->select($sql, array($table))) > 0;
 	}
 
diff --git a/tests/Database/DatabaseSchemaBuilderTest.php b/tests/Database/DatabaseSchemaBuilderTest.php
@@ -0,0 +1,27 @@
+<?php
+
+use Mockery as m;
+use Illuminate\Database\Schema\Builder;
+
+class DatabaseSchemaBuilderTest extends PHPUnit_Framework_TestCase {
+
+	public function tearDown()
+	{
+		m::close();
+	}
+
+
+	public function testHasTableCorrectlyCallsGrammar()
+	{
+		$connection = m::mock('Illuminate\Database\Connection');
+		$grammar = m::mock('StdClass');
+		$connection->shouldReceive('getSchemaGrammar')->andReturn($grammar);
+		$builder = new Builder($connection);
+		$grammar->shouldReceive('compileTableExists')->once()->andReturn('sql');
+		$connection->shouldReceive('getTablePrefix')->once()->andReturn('prefix_');
+		$connection->shouldReceive('select')->once()->with('sql', array('prefix_table'))->andReturn(array('prefix_table'));
+
+		$this->assertTrue($builder->hasTable('table'));
+	}
+
+}

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,8 @@ public function hasTable($table)`
`42`	`42`	`{`
`43`	`43`	`$sql = $this->grammar->compileTableExists();`
`44`	`44`
	`45`	`+ $table = $this->connection->getTablePrefix().$table;`
	`46`	`+`
`45`	`47`	`return count($this->connection->select($sql, array($table))) > 0;`
`46`	`48`	`}`
`47`	`49`