ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing merge issues

Browse Source
This commit is contained in:
Dayle Rees
2012-07-27 13:52:15 +01:00
parent da35e257fd b325e954e3
commit 2c6ed23b45
48 changed files with 101 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
laravel/database/schema/grammars/mysql.php
View File

@@ -47,7 +47,7 @@ class MySQL extends Grammar {
{
$columns = $this->columns($table);
// Once we the array of column definitions, we need to add "add" to the
// Once we have the array of column definitions, we need to add "add" to the
// front of each definition, then we'll concatenate the definitions
// using commas like normal and generate the SQL.
$columns = implode(', ', array_map(function($column)

2
laravel/database/schema/grammars/postgres.php
View File

@@ -35,7 +35,7 @@ class Postgres extends Grammar {
{
$columns = $this->columns($table);
// Once we the array of column definitions, we need to add "add" to the
// Once we have the array of column definitions, we need to add "add" to the
// front of each definition, then we'll concatenate the definitions
// using commas like normal and generate the SQL.
$columns = implode(', ', array_map(function($column)

6
laravel/database/schema/grammars/sqlite.php
View File

@@ -29,7 +29,7 @@ class SQLite extends Grammar {
return $value->type == 'primary';
});
// If we found primary key in the array of commands, we'll create the SQL for
// If we found primary keys in the array of commands, we'll create the SQL for
// the key addition and append it to the SQL table creation statement for
// the schema table so the index is properly generated.
if ( ! is_null($primary))
@@ -53,7 +53,7 @@ class SQLite extends Grammar {
{
$columns = $this->columns($table);
// Once we the array of column definitions, we need to add "add" to the
// Once we have the array of column definitions, we need to add "add" to the
// front of each definition, then we'll concatenate the definitions
// using commas like normal and generate the SQL.
$columns = array_map(function($column)
@@ -87,7 +87,7 @@ class SQLite extends Grammar {
{
// Each of the data type's have their own definition creation method
// which is responsible for creating the SQL for the type. This lets
// us to keep the syntax easy and fluent, while translating the
// us keep the syntax easy and fluent, while translating the
// types to the types used by the database.
$sql = $this->wrap($column).' '.$this->type($column);

6
laravel/database/schema/grammars/sqlserver.php
View File

@@ -32,7 +32,7 @@ class SQLServer extends Grammar {
}
/**
* Geenrate the SQL statements for a table modification command.
* Generate the SQL statements for a table modification command.
*
* @param Table $table
* @param Fluent $command
@@ -42,7 +42,7 @@ class SQLServer extends Grammar {
{
$columns = $this->columns($table);
// Once we the array of column definitions, we need to add "add" to the
// Once we have the array of column definitions, we need to add "add" to the
// front of each definition, then we'll concatenate the definitions
// using commas like normal and generate the SQL.
$columns = implode(', ', array_map(function($column)
@@ -247,7 +247,7 @@ class SQLServer extends Grammar {
{
$columns = array_map(array($this, 'wrap'), $command->columns);
// Once we the array of column names, we need to add "drop" to the front
// Once we have the array of column names, we need to add "drop" to the front
// of each column, then we'll concatenate the columns using commas and
// generate the alter statement SQL.
$columns = implode(', ', array_map(function($column)