From 209621f222b65a7d6d5066b4146f3d34de31fa76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=91=E6=9E=97?= <as2252258@163.com>
Date: Tue, 18 Jan 2022 17:53:32 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"=E6=94=B9=E5=90=8D"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit fdf58326
---
 Db.php    |  9 ++++++---
 Model.php | 11 ++++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/Db.php b/Db.php
index 7d56ec1..24e0c26 100644
--- a/Db.php
+++ b/Db.php
@@ -43,7 +43,8 @@ class Db implements ISqlBuilder
 	public static function beginTransaction()
 	{
 		if (!static::transactionsActive()) {
-			di(EventDispatch::class)->dispatch(new BeginTransaction());
+			$event = \Kiri::getDi()->get(EventDispatch::class);
+			$event->dispatch(new BeginTransaction());
 		}
 		static::$_inTransaction = true;
 	}
@@ -55,7 +56,8 @@ class Db implements ISqlBuilder
 	public static function commit()
 	{
 		if (static::transactionsActive()) {
-			di(EventDispatch::class)->dispatch(new Commit());
+			$event = \Kiri::getDi()->get(EventDispatch::class);
+			$event->dispatch(new Commit());
 		}
 		static::$_inTransaction = false;
 	}
@@ -67,7 +69,8 @@ class Db implements ISqlBuilder
 	public static function rollback()
 	{
 		if (static::transactionsActive()) {
-			di(EventDispatch::class)->dispatch(new Rollback());
+			$event = \Kiri::getDi()->get(EventDispatch::class);
+			$event->dispatch(new Rollback());
 		}
 		static::$_inTransaction = false;
 	}
diff --git a/Model.php b/Model.php
index 5b80723..2d167c0 100644
--- a/Model.php
+++ b/Model.php
@@ -112,7 +112,8 @@ class Model extends Base\Model
 		if (empty($attributes)) {
 			return $logger->addError(FIND_OR_CREATE_MESSAGE, 'mysql');
 		}
-//		Db::beginTransaction();
+		var_dump('start transaction');
+		Db::beginTransaction();
 		/** @var static $select */
 		$select = static::query()->where($condition)->first();
 		if (empty($select)) {
@@ -120,11 +121,15 @@ class Model extends Base\Model
 			$select->attributes = $attributes;
 			$select->setIsNowExample(true);
 			if (!$select->save()) {
-//				Db::rollback();
+				var_dump('end rollback');
+				Db::rollback();
 				return $logger->addError($select->getLastError(), 'mysql');
 			}
 		}
-//		Db::commit();
+
+		var_dump('end commit');
+
+		Db::commit();
 		return $select;
 	}