From 84e6feae1f0a587f6a5ece7fbe38493bb15ad522 Mon Sep 17 00:00:00 2001
From: zwang28 <70626450+zwang28@users.noreply.github.com>
Date: Sat, 11 Jan 2025 07:42:17 +0800
Subject: [PATCH] fix(meta): work around sea-orm bug (#20099)

---
 src/meta/src/hummock/manager/gc.rs          |  4 ++--
 src/meta/src/hummock/manager/time_travel.rs | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/meta/src/hummock/manager/gc.rs b/src/meta/src/hummock/manager/gc.rs
index ec95be60e7d80..c3ef15c98dcc9 100644
--- a/src/meta/src/hummock/manager/gc.rs
+++ b/src/meta/src/hummock/manager/gc.rs
@@ -477,8 +477,8 @@ impl HummockManager {
             }
             hummock_gc_history::Entity::insert_many(batch)
                 .on_conflict(
-                    OnConflict::column(hummock_gc_history::Column::ObjectId)
-                        .do_nothing()
+                    OnConflict::new()
+                        .update_column(hummock_gc_history::Column::ObjectId)
                         .to_owned(),
                 )
                 .do_nothing()
diff --git a/src/meta/src/hummock/manager/time_travel.rs b/src/meta/src/hummock/manager/time_travel.rs
index a0f929c9d4038..e951377af5ddf 100644
--- a/src/meta/src/hummock/manager/time_travel.rs
+++ b/src/meta/src/hummock/manager/time_travel.rs
@@ -413,8 +413,8 @@ impl HummockManager {
                 }
                 hummock_sstable_info::Entity::insert_many(batch)
                     .on_conflict(
-                        OnConflict::column(hummock_sstable_info::Column::SstId)
-                            .do_nothing()
+                        OnConflict::new()
+                            .update_column(hummock_sstable_info::Column::SstId)
                             .to_owned(),
                     )
                     .do_nothing()
@@ -467,8 +467,8 @@ impl HummockManager {
             };
             hummock_time_travel_version::Entity::insert(m)
                 .on_conflict(
-                    OnConflict::column(hummock_time_travel_version::Column::VersionId)
-                        .do_nothing()
+                    OnConflict::new()
+                        .update_column(hummock_time_travel_version::Column::VersionId)
                         .to_owned(),
                 )
                 .do_nothing()
@@ -499,8 +499,8 @@ impl HummockManager {
             };
             hummock_time_travel_delta::Entity::insert(m)
                 .on_conflict(
-                    OnConflict::column(hummock_time_travel_delta::Column::VersionId)
-                        .do_nothing()
+                    OnConflict::new()
+                        .update_column(hummock_time_travel_delta::Column::VersionId)
                         .to_owned(),
                 )
                 .do_nothing()