diff --git a/src/BBOrm/DBInstance.php b/src/BBOrm/DBInstance.php index 5a29f84..afcdaab 100644 --- a/src/BBOrm/DBInstance.php +++ b/src/BBOrm/DBInstance.php @@ -4,11 +4,11 @@ namespace BBOrm; class DBInstance { - public static function execute($sql, $intance = 'default', $data = null) { + public static function execute($sql, $data = null, $intance = 'default') { if ($data) { self::query_prepare($sql, $data, $instance); } else { - $con = Connections::get_connection('default'); + $con = Connections::get_connection($intance); $con->exec($sql); } } @@ -18,28 +18,28 @@ class DBInstance { return $con->lastInsertId(); } - public static function query($sql, $instance = 'default', $data = null) { + public static function query($sql, $data = null, $instance = 'default') { if ($data) { return self::query_prepare($sql, $data, $instance); } else { - $con = Connections::get_connection('default'); + $con = Connections::get_connection($intance); return $con->query($sql, \PDO::FETCH_OBJ); } } - public static function query_one($sql, $instance = 'default', $data = null) { + public static function query_one($sql, $data = null, $instance = 'default') { if ($data) { return self::query_prepare($sql, $data, $instance); } else { - $con = Connections::get_connection('default'); + $con = Connections::get_connection($intance); return $con->query($sql, \PDO::FETCH_OBJ)->fetch(); } } - public static function query_prepare($sql, $arguments, $instance = 'default') { - $con = Connections::get_connection('default'); + public static function query_prepare($sql, $data = Array(), $instance = 'default') { + $con = Connections::get_connection($intance); $statement = $con->prepare($sql); - $statement->execute($arguments); + $statement->execute($data); return $statement->fetchAll(\PDO::FETCH_OBJ); } diff --git a/src/BBOrm/Entity.php b/src/BBOrm/Entity.php index c626f4d..66d6365 100644 --- a/src/BBOrm/Entity.php +++ b/src/BBOrm/Entity.php @@ -19,10 +19,6 @@ abstract class Entity { const _properties = Array(); - public function teste() { - return static::class; - } - public static function get_properties() { $properties = Array(); foreach (static::_properties as $propertie) { @@ -73,7 +69,7 @@ abstract class Entity { $update_string = rtrim($update_string, ', '); $sql = "UPDATE " . static::table_name . " SET $update_string WHERE id = :_update_id"; - DBInstance::execute($sql, $this->connection_name, $update_data); + DBInstance::execute($sql, $update_data, static::connection_name); } private function create() { @@ -95,7 +91,7 @@ abstract class Entity { $second_argument = rtrim($second_argument, ', '); $sql = "INSERT INTO " . static::table_name . " ($first_argument) VALUES ($second_argument)"; - DBInstance::execute($sql, static::connection_name, $insert_data); + DBInstance::execute($sql, $insert_data, static::connection_name); $this->id = DBInstance::last_insert(); } @@ -120,7 +116,7 @@ abstract class Entity { public function purge() { $sql = "DELETE FROM " . static::table_name . " WHERE id = :id"; - DBInstance::execute($sql, static::connection_name, Array('id' => $this->id)); + DBInstance::execute($sql, Array('id' => $this->id), static::connection_name); } private function fill($data) { @@ -161,7 +157,7 @@ abstract class Entity { $sql = "SELECT $criteria FROM " . static::table_name . " $limits_sql"; } - $results = DBInstance::query($sql, static::connection_name); + $results = DBInstance::query($sql, Array(), static::connection_name); $objects = Array(); foreach ($results as $value) { @@ -213,7 +209,7 @@ abstract class Entity { $sql = "SELECT COUNT(*) FROM " . static::table_name . " $criteria_sql"; } - $results = DBInstance::query_one($sql, static::connection_name, $criteria_data); + $results = DBInstance::query_one($sql, $criteria_data, static::connection_name); return $results->count; } @@ -272,7 +268,7 @@ abstract class Entity { $sql = "SELECT $select_sql FROM " . static::table_name . " $criteria_sql $limits_sql"; } - $results = DBInstance::query($sql, static::connection_name, $criteria_data); + $results = DBInstance::query($sql, $criteria_data, static::connection_name); $objects = Array(); foreach ($results as $value) { @@ -331,7 +327,7 @@ abstract class Entity { $sql = "SELECT $select_sql FROM " . static::table_name . " $criteria_sql $limits_sql"; } - $results = DBInstance::query($sql, static::connection_name); + $results = DBInstance::query($sql, Array(), static::connection_name); $objects = Array(); foreach ($results as $value) { @@ -438,7 +434,7 @@ abstract class Entity { } $sql = "SELECT $remote_in_pivot FROM $pivot_table WHERE $local_in_pivot = $this->id $limits_sql"; - $relations = DBInstance::query($sql, static::connection_name); + $relations = DBInstance::query($sql, Array(), static::connection_name); $ids = Array(); foreach ($relations as $relation) { $ids[] = $relation->$remote_in_pivot; @@ -477,7 +473,7 @@ abstract class Entity { } $sql = "SELECT * FROM $pivot_table WHERE $local_in_pivot = $this->id $limits_sql"; - $relations = DBInstance::query($sql, static::connection_name); + $relations = DBInstance::query($sql, Array(), static::connection_name); $objects = Array(); if (empty($relations)) {