From ef8194b449a62ae8ae2c2ba838d71ae632c6bad8 Mon Sep 17 00:00:00 2001
From: Takayuki Maeda <41065217+TaKO8Ki@users.noreply.github.com>
Date: Tue, 14 Sep 2021 22:55:16 +0900
Subject: [PATCH] Fix SQL syntax error in PostgreSQL `get_record` (#101)

* fix SQL syntax error

* v0.1.0-alpha.4

* revert database-tree version
---
 Cargo.lock               | 2 +-
 Cargo.toml               | 2 +-
 README.md                | 2 +-
 src/database/postgres.rs | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 76ba185..44ab7de 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -503,7 +503,7 @@ dependencies = [
 
 [[package]]
 name = "gobang"
-version = "0.1.0-alpha.3"
+version = "0.1.0-alpha.4"
 dependencies = [
  "anyhow",
  "async-trait",
diff --git a/Cargo.toml b/Cargo.toml
index 9188c1c..5b0b573 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "gobang"
-version = "0.1.0-alpha.3"
+version = "0.1.0-alpha.4"
 authors = ["Takayuki Maeda <takoyaki0316@gmail.com>"]
 edition = "2018"
 license = "MIT"
diff --git a/README.md b/README.md
index dd2df2f..6bbcb86 100644
--- a/README.md
+++ b/README.md
@@ -44,7 +44,7 @@ $ brew install tako8ki/tap/gobang
 If you already have a Rust environment set up, you can use the `cargo install` command:
 
 ```
-$ cargo install --version 0.1.0-alpha.3 gobang
+$ cargo install --version 0.1.0-alpha.4 gobang
 ```
 
 ### Using a release binary (Linux/macOS/Windows)
diff --git a/src/database/postgres.rs b/src/database/postgres.rs
index 65cf574..fd0c597 100644
--- a/src/database/postgres.rs
+++ b/src/database/postgres.rs
@@ -207,7 +207,7 @@ impl Pool for PostgresPool {
     ) -> anyhow::Result<(Vec<String>, Vec<Vec<String>>)> {
         let query = if let Some(filter) = filter.as_ref() {
             format!(
-                r#"SELECT * FROM "{database}""{table_schema}"."{table}" WHERE {filter} LIMIT {page}, {limit}"#,
+                r#"SELECT * FROM "{database}"."{table_schema}"."{table}" WHERE {filter} LIMIT {limit} OFFSET {page}"#,
                 database = database.name,
                 table = table.name,
                 filter = filter,
@@ -217,7 +217,7 @@ impl Pool for PostgresPool {
             )
         } else {
             format!(
-                r#"SELECT * FROM "{database}"."{table_schema}"."{table}" limit {limit} offset {page}"#,
+                r#"SELECT * FROM "{database}"."{table_schema}"."{table}" LIMIT {limit} OFFSET {page}"#,
                 database = database.name,
                 table = table.name,
                 table_schema = table.schema.clone().unwrap_or_else(|| "public".to_string()),
@@ -441,7 +441,7 @@ impl PostgresPool {
     ) -> anyhow::Result<Vec<serde_json::Value>> {
         let query = if let Some(filter) = filter {
             format!(
-                r#"SELECT to_json({table}.*) FROM "{database}""{table_schema}"."{table}" WHERE {filter} LIMIT {page}, {limit}"#,
+                r#"SELECT to_json({table}.*) FROM "{database}"."{table_schema}"."{table}" WHERE {filter} LIMIT {limit} OFFSET {page}"#,
                 database = database.name,
                 table = table.name,
                 filter = filter,
@@ -451,7 +451,7 @@ impl PostgresPool {
             )
         } else {
             format!(
-                r#"SELECT to_json({table}.*) FROM "{database}"."{table_schema}"."{table}" limit {limit} offset {page}"#,
+                r#"SELECT to_json({table}.*) FROM "{database}"."{table_schema}"."{table}" LIMIT {limit} OFFSET {page}"#,
                 database = database.name,
                 table = table.name,
                 table_schema = table.schema.clone().unwrap_or_else(|| "public".to_string()),