修复判断事务时Db实例错误 (#532)

imiphp · Jun 7, 2023 · 80d1c6f · 80d1c6f
1 parent 47a8130
commit 80d1c6f
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/src/Db/Query/Query.php b/src/Db/Query/Query.php
@@ -184,6 +184,11 @@ public function setOption($option): self
      */
     public function getDb(): IDb
     {
+        if (!$this->isInitDb)
+        {
+            $this->db = Db::getInstance($this->poolName, $this->queryType);
+        }
+
         return $this->db;
     }
 
@@ -886,15 +891,7 @@ protected function executeEx(string $sql, string $resultClass)
     {
         try
         {
-            $db = &$this->db;
-            if (!$this->isInitDb)
-            {
-                $db = Db::getInstance($this->poolName, $this->queryType);
-            }
-            if (!$db)
-            {
-                return new $resultClass(false);
-            }
+            $db = $this->getDb();
             $stmt = $db->prepare($sql);
             $binds = $this->binds;
             $this->binds = [];
@@ -971,7 +968,12 @@ public function setFieldDec(string $fieldName, float $decValue = 1): self
      */
     protected function isInTransaction(): bool
     {
-        return QueryType::WRITE === $this->queryType && Db::getInstance($this->poolName)->inTransaction();
+        if (QueryType::WRITE !== $this->queryType)
+        {
+            return false;
+        }
+
+        return $this->getDb()->inTransaction();
     }
 
     /**