From 0f2d3117393051d418008423c1d2947c4222a86b Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Sun, 12 Feb 2012 16:34:11 -0600 Subject: [PATCH] cleaning up some code. --- laravel/database/connection.php | 3 +-- laravel/database/query.php | 5 ++-- laravel/database/schema.php | 26 +++++++++---------- laravel/database/schema/grammars/mysql.php | 18 ++++++------- laravel/database/schema/grammars/postgres.php | 12 ++++----- laravel/database/schema/grammars/sqlite.php | 12 ++++----- .../database/schema/grammars/sqlserver.php | 12 ++++----- laravel/response.php | 2 +- laravel/view.php | 2 +- 9 files changed, 44 insertions(+), 48 deletions(-) diff --git a/laravel/database/connection.php b/laravel/database/connection.php index b8504cca..7d8136d5 100644 --- a/laravel/database/connection.php +++ b/laravel/database/connection.php @@ -222,8 +222,7 @@ protected function execute($sql, $bindings = array()) // Once we have execute the query, we log the SQL, bindings, and // execution time in a static array that is accessed by all of - // the connections used by the application. This allows us to - // review all of the executed SQL. + // the connections used by the application. $this->log($sql, $bindings, $time); return array($statement, $result); diff --git a/laravel/database/query.php b/laravel/database/query.php index fc7f91ce..55699526 100644 --- a/laravel/database/query.php +++ b/laravel/database/query.php @@ -399,7 +399,7 @@ protected function where_nested($callback, $connector) // To handle a nested where statement, we will actually instantiate a // new Query instance and run the callback over that instance, which - // will allow the developer to have a fresh query to work with. + // will allow the developer to have a fresh query. $query = new Query($this->connection, $this->grammar, $this->from); // Once the callback has been run on the query, we will store the @@ -623,8 +623,7 @@ public function get($columns = array('*')) // If the query has an offset and we are using the SQL Server grammar, // we need to spin through the results and remove the "rownum" from - // each of the objects. Unfortunately SQL Server does not have an - // offset keyword, so we have to use row numbers in the query. + // each of the objects since there is no "offset". if ($this->offset > 0 and $this->grammar instanceof SQLServer) { array_walk($results, function($result) diff --git a/laravel/database/schema.php b/laravel/database/schema.php index 2434ab6a..ffd20fe1 100644 --- a/laravel/database/schema.php +++ b/laravel/database/schema.php @@ -35,17 +35,16 @@ public static function execute($table) $grammar = static::grammar($connection); - // Each grammar has a function that corresponds to the command type - // and is responsible for building that's commands SQL. This lets - // the SQL generation stay very granular and makes it simply to - // add new database systems to the schema system. + // Each grammar has a function that corresponds to the command type and is for + // building that command's SQL. This lets the SQL generation stay granular + // and flexible across various database systems. if (method_exists($grammar, $method = $command->type)) { $statements = $grammar->$method($table, $command); - // Once we have the statements, we will cast them to an array - // even though not all of the commands return an array just - // in case the command needs to run more than one query. + // Once we have the statements, we will cast them to an array even though + // not all of the commands return an array just in case the command + // needs multiple queries to complete its database work. foreach ((array) $statements as $statement) { $connection->statement($statement); @@ -62,10 +61,9 @@ public static function execute($table) */ protected static function implications($table) { - // If the developer has specified columns for the table and the - // table is not being created, we will assume they simply want - // to add the columns to the table, and will generate an add - // command on the schema automatically. + // If the developer has specified columns for the table and the table is + // not being created, we'll assume they simply want to add the columns + // to the table and generate the add command. if (count($table->columns) > 0 and ! $table->creating()) { $command = new Fluent(array('type' => 'add')); @@ -73,9 +71,9 @@ protected static function implications($table) array_unshift($table->commands, $command); } - // For some extra syntax sugar, we'll check for any implicit - // indexes on the table since the developer may specify the - // index type on the fluent column declaration. + // For some extra syntax sugar, we'll check for any implicit indexes + // on the table since the developer may specify the index type on + // the fluent column declaration for convenience. foreach ($table->columns as $column) { foreach (array('primary', 'unique', 'fulltext', 'index') as $key) diff --git a/laravel/database/schema/grammars/mysql.php b/laravel/database/schema/grammars/mysql.php index 375183dd..ece51d62 100644 --- a/laravel/database/schema/grammars/mysql.php +++ b/laravel/database/schema/grammars/mysql.php @@ -23,14 +23,14 @@ public function create(Table $table, Fluent $command) { $columns = implode(', ', $this->columns($table)); - // First we will generate the base table creation statement. Other than incrementing - // keys, no indexes will be created during the first creation of the table since - // they will be added in separate commands. + // First we will generate the base table creation statement. Other than auto + // incrementing keys, no indexes will be created during the first creation + // of the table as they're added in separate commands. $sql = 'CREATE TABLE '.$this->wrap($table).' ('.$columns.')'; - // MySQL supports various "engines" for database tables. If an engine ws specified - // by the developer, we will set it after adding the columns the table creation - // statement. Some engines support extra indexes. + // MySQL supports various "engines" for database tables. If an engine was + // specified by the developer, we will set it after adding the columns + // the table creation statement the schema. if ( ! is_null($table->engine)) { $sql .= ' ENGINE = '.$table->engine; @@ -50,9 +50,9 @@ public function add(Table $table, Fluent $command) { $columns = $this->columns($table); - // Once we 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. + // Once we 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) { return 'ADD '.$column; diff --git a/laravel/database/schema/grammars/postgres.php b/laravel/database/schema/grammars/postgres.php index ac34b282..fc4096ac 100644 --- a/laravel/database/schema/grammars/postgres.php +++ b/laravel/database/schema/grammars/postgres.php @@ -16,9 +16,9 @@ public function create(Table $table, Fluent $command) { $columns = implode(', ', $this->columns($table)); - // First we will generate the base table creation statement. Other than incrementing - // keys, no indexes will be created during the first creation of the table since - // they will be added in separate commands. + // First we will generate the base table creation statement. Other than auto + // incrementing keys, no indexes will be created during the first creation + // of the table as they're added in separate commands. $sql = 'CREATE TABLE '.$this->wrap($table).' ('.$columns.')'; return $sql; @@ -35,9 +35,9 @@ public function add(Table $table, Fluent $command) { $columns = $this->columns($table); - // Once we 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. + // Once we 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) { return 'ADD COLUMN '.$column; diff --git a/laravel/database/schema/grammars/sqlite.php b/laravel/database/schema/grammars/sqlite.php index f704cc1c..30bd5bb0 100644 --- a/laravel/database/schema/grammars/sqlite.php +++ b/laravel/database/schema/grammars/sqlite.php @@ -53,18 +53,18 @@ public function add(Table $table, Fluent $command) { $columns = $this->columns($table); - // Once we 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. + // Once we 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) { return 'ADD COLUMN '.$column; }, $columns); - // SQLite only allows one column to be added in an ALTER statement, so we - // will create an array of statements and return them all to the schema - // manager, which will execute each one separately. + // SQLite only allows one column to be added in an ALTER statement, + // so we will create an array of statements and return them all to + // the schema manager for separate execution. foreach ($columns as $column) { $sql[] = 'ALTER TABLE '.$this->wrap($table).' '.$column; diff --git a/laravel/database/schema/grammars/sqlserver.php b/laravel/database/schema/grammars/sqlserver.php index 7b20fdd5..eb6eb785 100644 --- a/laravel/database/schema/grammars/sqlserver.php +++ b/laravel/database/schema/grammars/sqlserver.php @@ -23,9 +23,9 @@ public function create(Table $table, Fluent $command) { $columns = implode(', ', $this->columns($table)); - // First we will generate the base table creation statement. Other than incrementing - // keys, no indexes will be created during the first creation of the table since - // they will be added in separate commands. + // First we will generate the base table creation statement. Other than auto + // incrementing keys, no indexes will be created during the first creation + // of the table as they're added in separate commands. $sql = 'CREATE TABLE '.$this->wrap($table).' ('.$columns.')'; return $sql; @@ -42,9 +42,9 @@ public function add(Table $table, Fluent $command) { $columns = $this->columns($table); - // Once we 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. + // Once we 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) { return 'ADD '.$column; diff --git a/laravel/response.php b/laravel/response.php index 11a9a2bf..b179afce 100644 --- a/laravel/response.php +++ b/laravel/response.php @@ -285,7 +285,7 @@ public function send_headers() // Once the framework controlled headers have been sentm, we can // simply iterate over the developer's headers and send each one - // to the browser. Headers with the same name will be overriden. + // back to the browser for the response. foreach ($this->headers as $name => $value) { header("{$name}: {$value}", true); diff --git a/laravel/view.php b/laravel/view.php index a8ec4796..2b408217 100644 --- a/laravel/view.php +++ b/laravel/view.php @@ -213,7 +213,7 @@ public function render() // // Also, if the Blade view has expired or doesn't exist it will be // re-compiled and placed in the view storage directory. The Blade - // views are re-compiled each time the original view is changed. + // views are re-compiled the original view changes. if (strpos($this->path, BLADE_EXT) !== false) { $this->path = $this->compile();