From 3123a9d129964058ae81a555ad83cdc6a82eab29 Mon Sep 17 00:00:00 2001 From: Billy Chan Date: Thu, 30 Sep 2021 11:40:27 +0800 Subject: [PATCH] Fix git merge conflict --- src/executor/insert.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/executor/insert.rs b/src/executor/insert.rs index 4a7b55a2..ed4da269 100644 --- a/src/executor/insert.rs +++ b/src/executor/insert.rs @@ -91,14 +91,13 @@ where { type PrimaryKey = <::Entity as EntityTrait>::PrimaryKey; type ValueTypeOf = as PrimaryKeyTrait>::ValueType; - let last_insert_id_opt = match db { - #[cfg(feature = "sqlx-postgres")] - DatabaseConnection::SqlxPostgresPoolConnection(conn) => { + let last_insert_id_opt = match db.get_database_backend() { + DbBackend::Postgres => { use crate::{sea_query::Iden, Iterable}; let cols = PrimaryKey::::iter() .map(|col| col.to_string()) .collect::>(); - let res = conn.query_one(statement).await?.unwrap(); + let res = db.query_one(statement).await?.unwrap(); res.try_get_many("", cols.as_ref()).ok() } _ => {