balki/pgweb
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #601 from sosedoff/update-delete-with-returning-values

Browse Source 
Handle returning values in update/delete queries
This commit is contained in:
Dan Sosedoff 2022-12-05 21:12:46 -06:00 committed by GitHub
commit 5228eca9ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 50 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/client/client.go
View File

@ -356,7 +356,9 @@ func (client *Client) query(query string, args ...interface{}) (*Result, error)
}
action := strings.ToLower(strings.Split(query, " ")[0])
if action == "update" || action == "delete" {
hasReturnValues := strings.Contains(strings.ToLower(query), " returning ")
if (action == "update" || action == "delete") && !hasReturnValues {
res, err := client.db.Exec(query, args...)
if err != nil {
return nil, err

48
pkg/client/client_test.go
View File

@ -352,12 +352,57 @@ func testTableNameWithCamelCase(t *testing.T) {
func testQuery(t *testing.T) {
res, err := testClient.Query("SELECT * FROM books")
assert.Equal(t, nil, err)
assert.Equal(t, 4, len(res.Columns))
assert.Equal(t, 15, len(res.Rows))
}
func testUpdateQuery(t *testing.T) {
t.Run("updating data", func(t *testing.T) {
// Add new row
_, err := testClient.db.Exec("INSERT INTO books (id, title) VALUES (8888, 'Test Book'), (8889, 'Test Book 2')")
assert.NoError(t, err)
// Update without return values
res, err := testClient.Query("UPDATE books SET title = 'Foo' WHERE id >= 8888 AND id <= 8889")
assert.NoError(t, err)
assert.Equal(t, "Rows Affected", res.Columns[0])
assert.Equal(t, int64(2), res.Rows[0][0])
// Update with return values
res, err = testClient.Query("UPDATE books SET title = 'Foo2' WHERE id >= 8888 AND id <= 8889 RETURNING id, title")
assert.NoError(t, err)
assert.Equal(t, []string{"id", "title"}, res.Columns)
assert.Equal(t, Row{int64(8888), "Foo2"}, res.Rows[0])
assert.Equal(t, Row{int64(8889), "Foo2"}, res.Rows[1])
})
t.Run("deleting data", func(t *testing.T) {
// Add new row
_, err := testClient.db.Exec("INSERT INTO books (id, title) VALUES (9999, 'Test Book')")
assert.NoError(t, err)
// Delete the existing row
res, err := testClient.Query("DELETE FROM books WHERE id = 9999")
assert.NoError(t, err)
assert.Equal(t, "Rows Affected", res.Columns[0])
assert.Equal(t, int64(1), res.Rows[0][0])
// Deleting already deleted row
res, err = testClient.Query("DELETE FROM books WHERE id = 9999")
assert.NoError(t, err)
assert.Equal(t, int64(0), res.Rows[0][0])
// Delete with returning value
_, err = testClient.db.Exec("INSERT INTO books (id, title) VALUES (9999, 'Test Book')")
assert.NoError(t, err)
res, err = testClient.Query("DELETE FROM books WHERE id = 9999 RETURNING id")
assert.NoError(t, err)
assert.Equal(t, int64(9999), res.Rows[0][0])
})
}
func testQueryError(t *testing.T) {
res, err := testClient.Query("SELCT * FROM books")
@ -491,6 +536,7 @@ func TestAll(t *testing.T) {
testTableConstraints(t)
testTableNameWithCamelCase(t)
testQuery(t)
testUpdateQuery(t)
testQueryError(t)
testQueryInvalidTable(t)
testTableRowsOrderEscape(t)