diff --git a/laravel/database/connectors/sqlite.php b/laravel/database/connectors/sqlite.php index 97ad0cc5..aeb6e972 100644 --- a/laravel/database/connectors/sqlite.php +++ b/laravel/database/connectors/sqlite.php @@ -12,22 +12,19 @@ class SQLite extends Connector { { $options = $this->options($config); - // SQLite in-memory databases only live for the lifetime of the current request, and it - // is impossible to create two connections to the same in-memory database. if ($config['database'] == ':memory:') { return new PDO('sqlite::memory:', null, null, $options); } - // We will check for the database in the default storage directory for the application. - // Typically, this directory holds all of the SQLite databases for the application. + // First, we will check for the database in the default storage directory for the + // application. If we don't find the database there, we will assume the database + // name is actually a full qualified path to the database on disk and attempt + // to load it. If we still can't find it, we'll bail out. elseif (file_exists($path = DATABASE_PATH.$config['database'].'.sqlite')) { return new PDO('sqlite:'.$path, null, null, $options); } - - // If we still haven't located the database, we will assume the given database name - // is a fully qualified path to the database on disk and attempt to load it. elseif (file_exists($config['database'])) { return new PDO('sqlite:'.$config['database'], null, null, $options); diff --git a/laravel/database/query.php b/laravel/database/query.php index 60fb30a0..eceb60c9 100644 --- a/laravel/database/query.php +++ b/laravel/database/query.php @@ -110,7 +110,6 @@ class Query { public function distinct() { $this->distinct = true; - return $this; } @@ -123,7 +122,6 @@ class Query { public function select($columns = array('*')) { $this->selects = (array) $columns; - return $this; } @@ -405,7 +403,6 @@ class Query { public function order_by($column, $direction = 'asc') { $this->orderings[] = compact('column', 'direction'); - return $this; } @@ -418,7 +415,6 @@ class Query { public function skip($value) { $this->offset = $value; - return $this; } @@ -431,7 +427,6 @@ class Query { public function take($value) { $this->limit = $value; - return $this; }