Merge pull request #65 from supabase/fix/bq-pagination-pushdown

feat: add pagination and pushdown for bq fdw
supabase · Mar 1, 2023 · 73b352f · 73b352f
2 parents 6951340 + 0c4004b
commit 73b352f
Show file tree

Hide file tree

Showing 9 changed files with 142 additions and 64 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/supabase-wrappers-macros/Cargo.toml b/supabase-wrappers-macros/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "supabase-wrappers-macros"
-version = "0.1.7"
+version = "0.1.8"
 edition = "2021"
 authors = ["Supabase Inc. https://supabase.com/"]
 license = "Apache-2.0"

diff --git a/supabase-wrappers/Cargo.toml b/supabase-wrappers/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "supabase-wrappers"
-version = "0.1.7"
+version = "0.1.8"
 edition = "2021"
 authors = ["Supabase Inc. https://supabase.com/"]
 license = "Apache-2.0"

diff --git a/supabase-wrappers/src/interface.rs b/supabase-wrappers/src/interface.rs
@@ -309,6 +309,30 @@ pub struct Sort {
     pub collate: Option<String>,
 }
 
+impl Sort {
+    pub fn deparse(&self) -> String {
+        let mut sql = format!("order by {}", self.field);
+
+        if self.reversed {
+            sql.push_str(" desc");
+        } else {
+            sql.push_str(" asc");
+        }
+
+        if self.nulls_first {
+            sql.push_str(" nulls first")
+        } else {
+            sql.push_str(" nulls last")
+        }
+
+        if let Some(collate) = &self.collate {
+            sql.push_str(&format!(" collate {}", collate));
+        }
+
+        sql
+    }
+}
+
 /// Query limit, a.k.a `LIMIT count OFFSET offset` clause
 ///
 /// ## Examples
@@ -328,6 +352,12 @@ pub struct Limit {
     pub offset: i64,
 }
 
+impl Limit {
+    pub fn deparse(&self) -> String {
+        format!("limit {} offset {}", self.count, self.offset)
+    }
+}
+
 /// The Foreign Data Wrapper trait
 ///
 /// This is the main interface for your foreign data wrapper. Required functions

diff --git a/wrappers/Cargo.lock b/wrappers/Cargo.lock
diff --git a/wrappers/Cargo.toml b/wrappers/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wrappers"
-version = "0.1.7"
+version = "0.1.8"
 edition = "2021"
 
 [lib]
@@ -38,7 +38,7 @@ clickhouse-rs = { git = "https://github.com/suharev7/clickhouse-rs", branch = "a
 chrono = { version = "0.4", optional = true }
 
 # for bigquery_fdw, firebase_fdw, airtable_fdw and etc.
-gcp-bigquery-client = { version = "0.16.0", optional = true }
+gcp-bigquery-client = { version = "0.16.5", optional = true }
 time = { version = "0.3.17", features = ["parsing"], optional = true }
 serde = { version = "1", optional = true }
 serde_json = { version = "1.0.86", optional = true }

diff --git a/wrappers/src/fdw/bigquery_fdw/README.md b/wrappers/src/fdw/bigquery_fdw/README.md
@@ -134,3 +134,4 @@ insert into people values (4, 'Yoda', current_timestamp());
 | Version | Date       | Notes                                                |
 | ------- | ---------- | ---------------------------------------------------- |
 | 0.1.0   | 2022-11-30 | Initial version                                      |
+| 0.1.1   | 2023-02-15 | Upgrade bq client lib to v0.16.5, code improvement   |