Merge branch 'master' of github.com:laravel/laravel into develop

2012-06-03 17:36:16 -05:00
parent 4dd82a0de3 0bdfea32e7
commit 1ac911f05d
3 changed files with 3 additions and 3 deletions
--- a/laravel/database/schema/grammars/sqlserver.php
+++ b/laravel/database/schema/grammars/sqlserver.php
@@ -138,7 +138,7 @@ class SQLServer extends Grammar {
 	{
 		$name = $command->name;

-		$columns = $this->columnize($command->$columns);
+		$columns = $this->columnize($command->columns);

 		return 'ALTER TABLE '.$this->wrap($table)." ADD CONSTRAINT {$name} PRIMARY KEY ({$columns})";
 	}