From 9e78e496627f385aec2dd048723857fea2d58290 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nguy=E1=BB=85n=20H=E1=BB=93ng=20Qu=C3=A2n?=
 <ng.hong.quan@gmail.com>
Date: Fri, 29 Dec 2023 12:09:50 +0700
Subject: [PATCH] Handle different behavior of EdgeDB v4.3

---
 Cargo.lock         | 9 +++++----
 Cargo.toml         | 8 ++++----
 admin/package.json | 4 ++--
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2beeff5..8a6bbd3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -942,7 +942,7 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
 [[package]]
 name = "edgedb-derive"
 version = "0.5.1"
-source = "git+https://github.com/edgedb/edgedb-rust.git?rev=60309cf#60309cf9654545da0036fd714902edcb9784b1f0"
+source = "git+https://github.com/hongquan/edgedb-rust.git?branch=fix/object-encoding#eed03f8bbabe7601d0d4f68920f7c0203a16b7c1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -953,7 +953,7 @@ dependencies = [
 [[package]]
 name = "edgedb-errors"
 version = "0.4.1"
-source = "git+https://github.com/edgedb/edgedb-rust.git?rev=60309cf#60309cf9654545da0036fd714902edcb9784b1f0"
+source = "git+https://github.com/hongquan/edgedb-rust.git?branch=fix/object-encoding#eed03f8bbabe7601d0d4f68920f7c0203a16b7c1"
 dependencies = [
  "bytes",
  "miette",
@@ -962,13 +962,14 @@ dependencies = [
 [[package]]
 name = "edgedb-protocol"
 version = "0.6.0"
-source = "git+https://github.com/edgedb/edgedb-rust.git?rev=60309cf#60309cf9654545da0036fd714902edcb9784b1f0"
+source = "git+https://github.com/hongquan/edgedb-rust.git?branch=fix/object-encoding#eed03f8bbabe7601d0d4f68920f7c0203a16b7c1"
 dependencies = [
  "bigdecimal",
  "bitflags 2.4.1",
  "bytes",
  "chrono",
  "edgedb-errors",
+ "log",
  "num-bigint",
  "num-traits",
  "snafu",
@@ -978,7 +979,7 @@ dependencies = [
 [[package]]
 name = "edgedb-tokio"
 version = "0.5.0"
-source = "git+https://github.com/edgedb/edgedb-rust.git?rev=60309cf#60309cf9654545da0036fd714902edcb9784b1f0"
+source = "git+https://github.com/hongquan/edgedb-rust.git?branch=fix/object-encoding#eed03f8bbabe7601d0d4f68920f7c0203a16b7c1"
 dependencies = [
  "anyhow",
  "arc-swap",
diff --git a/Cargo.toml b/Cargo.toml
index 1076f0c..ec5177e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -68,10 +68,10 @@ validify = "1.0.11"
 nonzero = "0.2.0"
 
 [patch.crates-io]
-edgedb-derive = { git = "https://github.com/edgedb/edgedb-rust.git", rev = "60309cf" }
-edgedb-errors = { git = "https://github.com/edgedb/edgedb-rust.git", rev = "60309cf" }
-edgedb-protocol = { git = "https://github.com/edgedb/edgedb-rust.git", rev = "60309cf" }
-edgedb-tokio = { git = "https://github.com/edgedb/edgedb-rust.git", rev = "60309cf" }
+edgedb-derive = { git = "https://github.com/hongquan/edgedb-rust.git", branch = "fix/object-encoding" }
+edgedb-errors = { git = "https://github.com/hongquan/edgedb-rust.git", branch = "fix/object-encoding" }
+edgedb-protocol = { git = "https://github.com/hongquan/edgedb-rust.git", branch = "fix/object-encoding" }
+edgedb-tokio = { git = "https://github.com/hongquan/edgedb-rust.git", branch = "fix/object-encoding" }
 
 [build-dependencies]
 crate-git-revision = "0.0.6"
diff --git a/admin/package.json b/admin/package.json
index 59151eb..a9ea985 100644
--- a/admin/package.json
+++ b/admin/package.json
@@ -4,9 +4,9 @@
   "version": "1.1.0",
   "type": "module",
   "scripts": {
-    "dev": "vite",
+    "dev": "bunx --bun vite",
     "lint": "eslint --ext .ts,.vue src",
-    "build": "vue-tsc --noEmit && vite build",
+    "build": "bunx --bun vue-tsc --noEmit && bunx --bun vite build",
     "preview": "vite preview"
   },
   "dependencies": {