Update Indexes() to also return column information

Author: justinclift

README.md

@@ -9,8 +9,8 @@ A Go library for accessing and using SQLite databases stored remotely on DBHub.i
 
 * Run read-only queries (eg SELECT statements) on databases, returning the results as JSON
 * List the databases in your account
-* List the names of tables, views, and indexes present in a database
-* List the columns present in a table or view, along with their details
+* List the tables, views, and indexes present in a database
+* List the columns in a table, view or index, along with their details
 * List the branches, releases, tags, and commits for a database
 * Generate diffs between two databases, or database revisions
 * Download a complete database
@@ -19,7 +19,6 @@ A Go library for accessing and using SQLite databases stored remotely on DBHub.i
 ### Still to do
 
 * Tests for each function
-* Retrieve index details for a database
 * Upload a complete database
 * Investigate what would be needed for this to work through the Go SQL API
 * Anything else people suggest and seems like a good idea :smile:

dbhub.go

@@ -149,7 +149,7 @@ func (c Connection) Download(dbOwner, dbName string, ident Identifier) (db io.Re
 }
 
 // Indexes returns the list of indexes present in the database, along with the table they belong to
-func (c Connection) Indexes(dbOwner, dbName string, ident Identifier) (idx map[string]string, err error) {
+func (c Connection) Indexes(dbOwner, dbName string, ident Identifier) (idx []com.APIJSONIndex, err error) {
 	// Prepare the API parameters
 	data := c.PrepareVals(dbOwner, dbName, ident)
 

examples/list_indexes/main.go

@@ -22,8 +22,11 @@ func main() {
 
 	// Display the retrieved list of indexes
 	fmt.Println("Indexes:")
-	for i, j := range indexes {
-		fmt.Printf("  * '%s' on table '%s'\n", i, j)
+	for _, j := range indexes {
+		fmt.Printf("  * '%s' on table '%s'\n", j.Name, j.Table)
+		for _, l := range j.Columns {
+			fmt.Printf("      Column name: %v\n", l.Name)
+			fmt.Printf("      Column ID: %v\n", l.CID)
+		}
 	}
-	fmt.Println()
 }

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.10
+require github.com/sqlitebrowser/dbhub.io v0.0.11

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.10 h1:Vg9LMABya1a/nHeUZ/YiMFEfKwmmDHM/f0vv0Iw0FWk=
-github.com/sqlitebrowser/dbhub.io v0.0.10/go.mod h1:GgZi8wkjdRGkkUVgYNuZp5i+Yps3jGt/jjRuLKRi6Po=
+github.com/sqlitebrowser/dbhub.io v0.0.11 h1:Ddkjiftx/q5+ZFbOHIvuK6mQk1ACs/3jea7AbwDJlYA=
+github.com/sqlitebrowser/dbhub.io v0.0.11/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=

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.10
+# github.com/sqlitebrowser/dbhub.io v0.0.11
 ## explicit
 github.com/sqlitebrowser/dbhub.io/common
 # github.com/sqlitebrowser/github_flavored_markdown v0.0.0-20190120045821-b8cf8f054e47