alihan/gobang-tui-database-management
1
0
Fork 0
mirror of https://github.com/TaKO8Ki/gobang.git synced 2021-09-19 22:32:56 +03:00
Code Issues Projects Releases Wiki Activity

Fix SQL syntax error in PostgreSQL get_record (#101)

Browse Source 
* fix SQL syntax error

* v0.1.0-alpha.4

* revert database-tree version
This commit is contained in:
Takayuki Maeda
2021-09-14 22:55:16 +09:00
committed by GitHub
parent 6615a235a7
commit ef8194b449
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@@ -503,7 +503,7 @@ dependencies = [
[[package]]
name = "gobang"
version = "0.1.0-alpha.3"
version = "0.1.0-alpha.4"
dependencies = [
"anyhow",
"async-trait",

2
Cargo.toml
View File

@@ -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"

2
README.md
View File

@@ -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)

8
src/database/postgres.rs
View File

@@ -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()),