refactor database structure... moved db\manager back to system\db.php

This commit is contained in:
Taylor Otwell
2011-08-13 22:23:07 -05:00
parent 21a6040a79
commit 9d4d6e52bd
5 changed files with 15 additions and 18 deletions

View File

@@ -1,10 +1,10 @@
<?php namespace System\DB\Eloquent;
use System\DB;
use System\Str;
use System\Config;
use System\Inflector;
use System\Paginator;
use System\DB\Manager;
abstract class Model {
@@ -135,7 +135,7 @@ abstract class Model {
// Since this method is only used for instantiating models for querying
// purposes, we will go ahead and set the Query instance on the model.
$model->query = Manager::connection(static::$connection)->table(static::table($class));
$model->query = DB::connection(static::$connection)->table(static::table($class));
return $model;
}
@@ -367,7 +367,7 @@ abstract class Model {
// Since the model was instantiated using "new", a query instance has not been set.
// Only models being used for querying have their query instances set by default.
$this->query = Manager::connection(static::$connection)->table(static::table($model));
$this->query = DB::connection(static::$connection)->table(static::table($model));
if (property_exists($model, 'timestamps') and $model::$timestamps)
{
@@ -416,7 +416,7 @@ abstract class Model {
// delete statement to the query instance.
if ( ! $this->exists) return $this->query->delete();
return Manager::connection(static::$connection)->table(static::table(get_class($this)))->delete($this->id);
return DB::connection(static::$connection)->table(static::table(get_class($this)))->delete($this->id);
}
/**