From e7839557c6e05bf00d09e630a39bc0b1fe6aa2f8 Mon Sep 17 00:00:00 2001 From: thinkphp Date: Mon, 9 May 2016 12:01:41 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A9=B1=E5=8A=A8=E6=94=B9=E8=BF=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- library/think/db/connector/Mysql.php | 7 ++++--- library/think/db/connector/Oracle.php | 5 +++-- library/think/db/connector/Pgsql.php | 5 +++-- library/think/db/connector/Sqlite.php | 5 +++-- library/think/db/connector/Sqlsrv.php | 4 ++-- 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/library/think/db/connector/Mysql.php b/library/think/db/connector/Mysql.php index 3e85d73a..b9d910d3 100644 --- a/library/think/db/connector/Mysql.php +++ b/library/think/db/connector/Mysql.php @@ -11,6 +11,7 @@ namespace think\db\connector; +use PDO; use think\db\Connection; use think\Log; @@ -55,7 +56,7 @@ class Mysql extends Connection } $sql = 'SHOW COLUMNS FROM `' . $tableName . '`'; $pdo = $this->linkID->query($sql); - $result = $pdo->fetchAll(\PDO::FETCH_ASSOC); + $result = $pdo->fetchAll(PDO::FETCH_ASSOC); $info = []; if ($result) { foreach ($result as $key => $val) { @@ -83,7 +84,7 @@ class Mysql extends Connection { $sql = !empty($dbName) ? 'SHOW TABLES FROM ' . $dbName : 'SHOW TABLES '; $pdo = $this->linkID->query($sql); - $result = $pdo->fetchAll(\PDO::FETCH_ASSOC); + $result = $pdo->fetchAll(PDO::FETCH_ASSOC); $info = []; foreach ($result as $key => $val) { $info[$key] = current($val); @@ -100,7 +101,7 @@ class Mysql extends Connection protected function getExplain($sql) { $pdo = $this->linkID->query("EXPLAIN " . $sql); - $result = $pdo->fetch(\PDO::FETCH_ASSOC); + $result = $pdo->fetch(PDO::FETCH_ASSOC); $result = array_change_key_case($result); if (isset($result['extra'])) { if (strpos($result['extra'], 'filesort') || strpos($result['extra'], 'temporary')) { diff --git a/library/think/db/connector/Oracle.php b/library/think/db/connector/Oracle.php index 55b38327..cc4f6496 100644 --- a/library/think/db/connector/Oracle.php +++ b/library/think/db/connector/Oracle.php @@ -11,6 +11,7 @@ namespace think\db\connector; +use PDO; use think\Db; use think\db\Connection; @@ -104,7 +105,7 @@ class Oracle extends Connection list($tableName) = explode(' ', $tableName); $sql = "select a.column_name,data_type,DECODE (nullable, 'Y', 0, 1) notnull,data_default, DECODE (A .column_name,b.column_name,1,0) pk from all_tab_columns a,(select column_name from all_constraints c, all_cons_columns col where c.constraint_name = col.constraint_name and c.constraint_type = 'P' and c.table_name = '" . strtoupper($tableName) . "' ) b where table_name = '" . strtoupper($tableName) . "' and a.column_name = b.column_name (+)"; $pdo = $this->linkID->query($sql); - $result = $pdo->fetchAll(\PDO::FETCH_ASSOC); + $result = $pdo->fetchAll(PDO::FETCH_ASSOC); $info = []; if ($result) { foreach ($result as $key => $val) { @@ -131,7 +132,7 @@ class Oracle extends Connection public function getTables() { $pdo = $this->linkID->query("select table_name from all_tables"); - $result = $pdo->fetchAll(\PDO::FETCH_ASSOC); + $result = $pdo->fetchAll(PDO::FETCH_ASSOC); $info = []; foreach ($result as $key => $val) { $info[$key] = current($val); diff --git a/library/think/db/connector/Pgsql.php b/library/think/db/connector/Pgsql.php index f5c78d5f..58a33c34 100644 --- a/library/think/db/connector/Pgsql.php +++ b/library/think/db/connector/Pgsql.php @@ -11,6 +11,7 @@ namespace think\db\connector; +use PDO; use think\db\Connection; /** @@ -45,7 +46,7 @@ class Pgsql extends Connection list($tableName) = explode(' ', $tableName); $sql = 'select fields_name as "field",fields_type as "type",fields_not_null as "null",fields_key_name as "key",fields_default as "default",fields_default as "extra" from table_msg(' . $tableName . ');'; $pdo = $this->linkID->query($sql); - $result = $pdo->fetchAll(\PDO::FETCH_ASSOC); + $result = $pdo->fetchAll(PDO::FETCH_ASSOC); $info = []; if ($result) { foreach ($result as $key => $val) { @@ -73,7 +74,7 @@ class Pgsql extends Connection { $sql = "select tablename as Tables_in_test from pg_tables where schemaname ='public'"; $pdo = $this->linkID->query($sql); - $result = $pdo->fetchAll(\PDO::FETCH_ASSOC); + $result = $pdo->fetchAll(PDO::FETCH_ASSOC); $info = []; foreach ($result as $key => $val) { $info[$key] = current($val); diff --git a/library/think/db/connector/Sqlite.php b/library/think/db/connector/Sqlite.php index 9758d46f..e3b03afb 100644 --- a/library/think/db/connector/Sqlite.php +++ b/library/think/db/connector/Sqlite.php @@ -11,6 +11,7 @@ namespace think\db\connector; +use PDO; use think\db\Connection; /** @@ -42,7 +43,7 @@ class Sqlite extends Connection list($tableName) = explode(' ', $tableName); $sql = 'PRAGMA table_info( ' . $tableName . ' )'; $pdo = $this->linkID->query($sql); - $result = $pdo->fetchAll(\PDO::FETCH_ASSOC); + $result = $pdo->fetchAll(PDO::FETCH_ASSOC); $info = []; if ($result) { foreach ($result as $key => $val) { @@ -72,7 +73,7 @@ class Sqlite extends Connection . "UNION ALL SELECT name FROM sqlite_temp_master " . "WHERE type='table' ORDER BY name"; $pdo = $this->linkID->query($sql); - $result = $pdo->fetchAll(\PDO::FETCH_ASSOC); + $result = $pdo->fetchAll(PDO::FETCH_ASSOC); $info = []; foreach ($result as $key => $val) { $info[$key] = current($val); diff --git a/library/think/db/connector/Sqlsrv.php b/library/think/db/connector/Sqlsrv.php index 2c7f43e0..2eead773 100644 --- a/library/think/db/connector/Sqlsrv.php +++ b/library/think/db/connector/Sqlsrv.php @@ -59,7 +59,7 @@ class Sqlsrv extends Connection AND t.table_name = c.table_name WHERE t.table_name = '$tableName'"; $pdo = $this->linkID->query($sql); - $result = $pdo->fetchAll(\PDO::FETCH_ASSOC); + $result = $pdo->fetchAll(PDO::FETCH_ASSOC); $info = []; if ($result) { foreach ($result as $key => $val) { @@ -90,7 +90,7 @@ class Sqlsrv extends Connection WHERE TABLE_TYPE = 'BASE TABLE' "; $pdo = $this->linkID->query($sql); - $result = $pdo->fetchAll(\PDO::FETCH_ASSOC); + $result = $pdo->fetchAll(PDO::FETCH_ASSOC); $info = []; foreach ($result as $key => $val) { $info[$key] = current($val);