This commit is contained in:
2021-04-29 18:23:21 +08:00
parent 995257ded3
commit 71434d543e
+11 -11
View File
@@ -19,7 +19,7 @@ use Snowflake\Snowflake;
* Class Db * Class Db
* @package Database * @package Database
*/ */
class Db class Db implements ISqlBuilder
{ {
use QueryTrait; use QueryTrait;
@@ -101,7 +101,7 @@ class Db
public function get(Connection $db = NULL): mixed public function get(Connection $db = NULL): mixed
{ {
if (empty($db)) { if (empty($db)) {
$db = Snowflake::app()->database; $db = Snowflake::app()->get('db');
} }
return $db->createCommand(SqlBuilder::builder($this)->one()) return $db->createCommand(SqlBuilder::builder($this)->one())
->all(); ->all();
@@ -124,7 +124,7 @@ class Db
public function find(Connection $db = NULL): mixed public function find(Connection $db = NULL): mixed
{ {
if (empty($db)) { if (empty($db)) {
$db = Snowflake::app()->database; $db = Snowflake::app()->get('db');
} }
return $db->createCommand(SqlBuilder::builder($this)->all()) return $db->createCommand(SqlBuilder::builder($this)->all())
->one(); ->one();
@@ -138,7 +138,7 @@ class Db
public function count(Connection $db = NULL): bool|int public function count(Connection $db = NULL): bool|int
{ {
if (empty($db)) { if (empty($db)) {
$db = Snowflake::app()->database; $db = Snowflake::app()->get('db');
} }
return $db->createCommand(SqlBuilder::builder($this)->count()) return $db->createCommand(SqlBuilder::builder($this)->count())
->exec(); ->exec();
@@ -152,7 +152,7 @@ class Db
public function exists(Connection $db = NULL): bool|int public function exists(Connection $db = NULL): bool|int
{ {
if (empty($db)) { if (empty($db)) {
$db = Snowflake::app()->database; $db = Snowflake::app()->get('db');
} }
return $db->createCommand(SqlBuilder::builder($this)->one()) return $db->createCommand(SqlBuilder::builder($this)->one())
->fetchColumn(); ->fetchColumn();
@@ -222,7 +222,7 @@ class Db
public function delete($db = null): bool|int public function delete($db = null): bool|int
{ {
if (empty($db)) { if (empty($db)) {
$db = Snowflake::app()->database; $db = Snowflake::app()->get('db');
} }
$query = $db->getBuild()->builder($this); $query = $db->getBuild()->builder($this);
@@ -239,7 +239,7 @@ class Db
public static function drop($table, $db = null): bool|int public static function drop($table, $db = null): bool|int
{ {
if (empty($db)) { if (empty($db)) {
$db = Snowflake::app()->database; $db = Snowflake::app()->get('db');
} }
return $db->createCommand('DROP TABLE ' . $table)->delete(); return $db->createCommand('DROP TABLE ' . $table)->delete();
} }
@@ -254,7 +254,7 @@ class Db
{ {
if (empty($db)) { if (empty($db)) {
$db = Snowflake::app()->database; $db = Snowflake::app()->get('db');
} }
return $db->createCommand('TRUNCATE ' . $table)->exec(); return $db->createCommand('TRUNCATE ' . $table)->exec();
@@ -270,7 +270,7 @@ class Db
{ {
if (empty($db)) { if (empty($db)) {
$db = Snowflake::app()->database; $db = Snowflake::app()->get('db');
} }
@@ -290,7 +290,7 @@ class Db
public static function desc($table, Connection $db = NULL): bool|int|null public static function desc($table, Connection $db = NULL): bool|int|null
{ {
if (empty($db)) { if (empty($db)) {
$db = Snowflake::app()->database; $db = Snowflake::app()->get('db');
} }
if (empty($table)) { if (empty($table)) {
@@ -314,7 +314,7 @@ class Db
} }
if (empty($db)) { if (empty($db)) {
$db = Snowflake::app()->database; $db = Snowflake::app()->get('db');
} }
$table = [' const TABLE = \'select * from %s where REFERENCED_TABLE_NAME=%s\';']; $table = [' const TABLE = \'select * from %s where REFERENCED_TABLE_NAME=%s\';'];