From 23f2a3d7119eb61efdcb70d27a2e8ea2045761aa Mon Sep 17 00:00:00 2001
From: Billy Chan <ccw.billy.123@gmail.com>
Date: Wed, 1 Sep 2021 22:04:43 +0800
Subject: [PATCH] Hotfix - git merge conflict

---
 src/executor/query.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/executor/query.rs b/src/executor/query.rs
index 8546a5e7..7be17b4b 100644
--- a/src/executor/query.rs
+++ b/src/executor/query.rs
@@ -18,7 +18,7 @@ pub(crate) enum QueryResultRow {
 }
 
 pub trait TryGetable: Sized {
-    fn try_get(res: &QueryResult, pre: &str, col: &str) -> Result<Self, DbErr>;
+    fn try_get(res: &QueryResult, pre: &str, col: &str) -> Result<Self, TryGetError>;
 }
 
 pub enum TryGetError {