balki/pgweb
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #191 from sosedoff/order-escape-query

Browse Source 
Add escaping to order statement
This commit is contained in:
Dan Sosedoff 2016-11-03 20:08:55 -05:00 committed by GitHub
commit 1e88d3dc5f
3 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
data/booktown.sql
View File

@ -17,6 +17,15 @@ CREATE DATABASE "booktown";
-- Name: DATABASE "booktown" Type: COMMENT Owner: -- Name: DATABASE "booktown" Type: COMMENT Owner:
-- --
CREATE TABLE "dummies" (
"id" integer NOT NULL,
"isDummy" boolean
);
INSERT INTO "dummies" VALUES (1, true);
INSERT INTO "dummies" VALUES (2, true);
COMMENT ON DATABASE "booktown" IS 'The Book Town Database.'; COMMENT ON DATABASE "booktown" IS 'The Book Town Database.';
-- --

2
pkg/client/client.go
View File

@ -158,7 +158,7 @@ func (client *Client) TableRows(table string, opts RowsOptions) (*Result, error)
opts.SortOrder = "ASC" opts.SortOrder = "ASC"
} }
sql += fmt.Sprintf(" ORDER BY %s %s", opts.SortColumn, opts.SortOrder) sql += fmt.Sprintf(` ORDER BY "%s" %s`, opts.SortColumn, opts.SortOrder)
} }
if opts.Limit > 0 { if opts.Limit > 0 {

13
pkg/client/client_test.go
View File

@ -180,6 +180,7 @@ func test_Objects(t *testing.T) {
"customers", "customers",
"daily_inventory", "daily_inventory",
"distinguished_authors", "distinguished_authors",
"dummies",
"editions", "editions",
"employees", "employees",
"favorite_authors", "favorite_authors",
@ -285,6 +286,17 @@ func test_QueryInvalidTable(t *testing.T) {
assert.Equal(t, true, res == nil) assert.Equal(t, true, res == nil)
} }
func test_TableRowsOrderEscape(t *testing.T) {
rows, err := testClient.TableRows("dummies", RowsOptions{SortColumn: "isDummy"})
assert.Equal(t, nil, err)
assert.Equal(t, 2, len(rows.Rows))
rows, err = testClient.TableRows("dummies", RowsOptions{SortColumn: "isdummy"})
assert.NotEqual(t, nil, err)
assert.Equal(t, `pq: column "isdummy" does not exist`, err.Error())
assert.Equal(t, true, rows == nil)
}
func test_ResultCsv(t *testing.T) { func test_ResultCsv(t *testing.T) {
res, _ := testClient.Query("SELECT * FROM books ORDER BY id ASC LIMIT 1") res, _ := testClient.Query("SELECT * FROM books ORDER BY id ASC LIMIT 1")
csv := res.CSV() csv := res.CSV()
@ -346,6 +358,7 @@ func TestAll(t *testing.T) {
test_Query(t) test_Query(t)
test_QueryError(t) test_QueryError(t)
test_QueryInvalidTable(t) test_QueryInvalidTable(t)
test_TableRowsOrderEscape(t)
test_ResultCsv(t) test_ResultCsv(t)
test_History(t) test_History(t)
test_HistoryError(t) test_HistoryError(t)