Add Delete() function, update vendored dependencies

Author: justinclift

README.md

@@ -22,6 +22,7 @@ A Go library for accessing and using SQLite databases stored remotely on DBHub.i
 * Have the backend server correctly use the incoming branch, release, and tag information
 * Tests for each function
 * Investigate what would be needed for this to work through the Go SQL API
+  * Probably need to improve the Query approach, to at least support placeholders and argument parameters
 * Anything else people suggest and seems like a good idea :smile:
 
 ### Requirements
@@ -143,7 +144,9 @@ ORDER BY table1.id;
 * [List tags](https://github.com/sqlitebrowser/go-dbhub/blob/master/examples/list_tags/main.go) - Display the tags for a database
 * [List commits](https://github.com/sqlitebrowser/go-dbhub/blob/master/examples/list_commits/main.go) - Display the commits for a database
 * [Generate diff between two revisions](https://github.com/sqlitebrowser/go-dbhub/blob/master/examples/diff_commits/main.go) - Figure out the differences between two databases or two versions of one database
+* [Upload database](https://github.com/sqlitebrowser/go-dbhub/blob/master/examples/upload/main.go) - Upload a new database file
 * [Download database](https://github.com/sqlitebrowser/go-dbhub/blob/master/examples/download_database/main.go) - Download the complete database file
+* [Delete database](https://github.com/sqlitebrowser/go-dbhub/blob/master/examples/delete_database/main.go) - Delete a database
 * [Retrieve metadata](https://github.com/sqlitebrowser/go-dbhub/blob/master/examples/metadata/main.go) - Download the database metadata (size, branches, commit list, etc)
 * [Web page](https://github.com/sqlitebrowser/go-dbhub/blob/master/examples/webpage/main.go) - Get the URL of the database file in the webUI.  eg. for web browsers
 

dbhub.go

@@ -88,6 +88,17 @@ func (c Connection) Databases() (databases []string, err error) {
 	return
 }
 
+// Delete deletes a database in your account
+func (c Connection) Delete(dbName string) (err error) {
+	// Prepare the API parameters
+	data := c.PrepareVals("", dbName, Identifier{})
+
+	// Delete the database
+	queryUrl := c.Server + "/v1/delete"
+	err = sendRequestJSON(queryUrl, data, nil)
+	return
+}
+
 // Diff returns the differences between two commits of two databases, or if the details on the second database are left empty,
 // between two commits of the same database. You can also specify the merge strategy used for the generated SQL statements.
 func (c Connection) Diff(dbOwnerA, dbNameA string, identA Identifier, dbOwnerB, dbNameB string, identB Identifier, merge MergeStrategy) (diffs com.Diffs, err error) {
@@ -181,8 +192,12 @@ func (c Connection) PrepareVals(dbOwner, dbName string, ident Identifier) (data
 	// Prepare the API parameters
 	data = url.Values{}
 	data.Set("apikey", c.APIKey)
-	data.Set("dbowner", dbOwner)
-	data.Set("dbname", dbName)
+	if dbOwner != "" {
+		data.Set("dbowner", dbOwner)
+	}
+	if dbName != "" {
+		data.Set("dbname", dbName)
+	}
 	if ident.Branch != "" {
 		data.Set("branch", ident.Branch)
 	}

examples/delete_database/main.go

@@ -0,0 +1,26 @@
+package main
+
+import (
+	"fmt"
+	"log"
+
+	"github.com/sqlitebrowser/go-dbhub"
+)
+
+func main() {
+	// Create a new DBHub.io API object
+	db, err := dbhub.New("YOUR_API_KEY_HERE")
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	// Delete a remote database
+	dbName := "Join Testing.sqlite"
+	err = db.Delete(dbName)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	// Display a success message
+	fmt.Printf("Database '%s' deleted\n", dbName)
+}

go.mod

@@ -10,4 +10,4 @@ replace (
 	github.com/Sirupsen/logrus v1.6.0 => github.com/sirupsen/logrus v1.6.0
 )
 
-require github.com/sqlitebrowser/dbhub.io v0.0.13
+require github.com/sqlitebrowser/dbhub.io v0.0.14

go.sum

@@ -123,8 +123,8 @@ github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e h1:qpG
 github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e/go.mod h1:HuIsMU8RRBOtsCgI77wP899iHVBQpCmg4ErYMZB+2IA=
 github.com/sqlitebrowser/blackfriday v9.0.0+incompatible h1:ddH/UyzasooYgGIblVU4R8DdmBuJ7QXLvSqX/0chZv4=
 github.com/sqlitebrowser/blackfriday v9.0.0+incompatible/go.mod h1:/zga9sqpWzcewuI83AO5JZwe9+6F9GgPDdqqdNNEL/0=
-github.com/sqlitebrowser/dbhub.io v0.0.13 h1:R29VyPD6LZmtsDicbK4ICnW4RnhiqN3c8+vvKS8RzHM=
-github.com/sqlitebrowser/dbhub.io v0.0.13/go.mod h1:GgZi8wkjdRGkkUVgYNuZp5i+Yps3jGt/jjRuLKRi6Po=
+github.com/sqlitebrowser/dbhub.io v0.0.14 h1:M//NHuEpEiTj5itk95UL/CzhskkIG32BnT9Aob9l/2M=
+github.com/sqlitebrowser/dbhub.io v0.0.14/go.mod h1:GgZi8wkjdRGkkUVgYNuZp5i+Yps3jGt/jjRuLKRi6Po=
 github.com/sqlitebrowser/github_flavored_markdown v0.0.0-20190120045821-b8cf8f054e47 h1:s0+Ea95n1LrsKh6rtclU/9Qb2/5ofvnfnR7gDDiFTw8=
 github.com/sqlitebrowser/github_flavored_markdown v0.0.0-20190120045821-b8cf8f054e47/go.mod h1:8vPIKi5FslxCXEgfQxrFtWfdclGy6VWAc9NA1ZTYCJg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=

http.go

@@ -33,9 +33,11 @@ func sendRequestJSON(queryUrl string, data url.Values, returnStructure interface
 	}
 
 	// Unmarshall the JSON response into the structure provided by the caller
-	err = json.NewDecoder(body).Decode(returnStructure)
-	if err != nil {
-		return
+	if returnStructure != nil {
+		err = json.NewDecoder(body).Decode(returnStructure)
+		if err != nil {
+			return
+		}
 	}
 	return
 }

vendor/github.com/sqlitebrowser/dbhub.io/common/responses.go

@@ -63,7 +63,7 @@ github.com/sourcegraph/annotate
 github.com/sourcegraph/syntaxhighlight
 # github.com/sqlitebrowser/blackfriday v9.0.0+incompatible
 github.com/sqlitebrowser/blackfriday
-# github.com/sqlitebrowser/dbhub.io v0.0.13
+# github.com/sqlitebrowser/dbhub.io v0.0.14
 ## explicit
 github.com/sqlitebrowser/dbhub.io/common
 # github.com/sqlitebrowser/github_flavored_markdown v0.0.0-20190120045821-b8cf8f054e47