Merge pull request #648 from tursodatabase/athos/group-fixes

Small fixes for groups
tursodatabase · Sep 25, 2023 · 77a1cc6 · 77a1cc6
2 parents 5f9c966 + 90e1575
commit 77a1cc6
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 42 deletions.
diff --git a/internal/cmd/db.go b/internal/cmd/db.go
@@ -194,23 +194,6 @@ func closestLocation(client *turso.Client) (string, error) {
 	return closest, nil
 }
 
-func isNorthAmerica(location string) bool {
-	switch location {
-	case "atl", "bos", "den", "dfw", "ewr", "iad", "lax", "mia", "ord", "sea", "sjc", "yul", "yyz":
-		return true
-	default:
-		return false
-	}
-}
-
-func suggestedLocation(mainLocation string, locations map[string]string) (string, string) {
-	if isNorthAmerica(mainLocation) {
-		return "fra", "Europe"
-	} else {
-		return "iad", "North America"
-	}
-}
-
 func isValidLocation(client *turso.Client, location string) bool {
 	locations, err := locations(client)
 	if err != nil {
@@ -220,14 +203,6 @@ func isValidLocation(client *turso.Client, location string) bool {
 	return ok
 }
 
-func locationDescription(client *turso.Client, id string) string {
-	locations, _ := locations(client)
-	if desc, ok := locations[id]; ok {
-		return desc
-	}
-	return fmt.Sprintf("Location ID: %s", id)
-}
-
 func formatLocation(client *turso.Client, id string) string {
 	locations, _ := locations(client)
 	if desc, ok := locations[id]; ok {

diff --git a/internal/cmd/db_create.go b/internal/cmd/db_create.go
@@ -17,6 +17,10 @@ func init() {
 	addFromDBFlag(createCmd)
 	addDbFromFileFlag(createCmd)
 	addLocationFlag(createCmd, "Location ID. If no ID is specified, closest location to you is used by default.")
+
+	addWaitFlag(createCmd, "Wait for the database to be ready to receive requests.")
+	addCanaryFlag(createCmd)
+	addEnableExtensionsFlag(createCmd)
 }
 
 var createCmd = &cobra.Command{

diff --git a/internal/cmd/db_list.go b/internal/cmd/db_list.go
@@ -70,7 +70,7 @@ func dbListTable(databases []turso.Database) (headers []string, data [][]string)
 	}
 
 	sort.Slice(data, func(i, j int) bool {
-		return data[i][0] > data[j][0]
+		return data[i][0] < data[j][0]
 	})
 
 	return []string{"Name", "Locations", "Group", "URL"}, data

diff --git a/internal/cmd/db_replicate.go b/internal/cmd/db_replicate.go
@@ -52,7 +52,7 @@ var replicateCmd = &cobra.Command{
 
 		if ok, _ := canReplicate(client, dbName); !ok {
 			cmd := internal.Emph(fmt.Sprintf("turso group locations add %s %s", database.Group, location))
-			return fmt.Errorf("database %s is part of a group.\nUse %s to replicate the group instead.", internal.Emph(dbName), cmd)
+			return fmt.Errorf("database %s is part of a group.\nUse %s to replicate the group instead", internal.Emph(dbName), cmd)
 		}
 
 		instance, err := replicate(client, database, location)

diff --git a/internal/cmd/db_show.go b/internal/cmd/db_show.go
@@ -83,6 +83,9 @@ var showCmd = &cobra.Command{
 		fmt.Println("Name:          ", db.Name)
 		fmt.Println("URL:           ", getDatabaseUrl(&db))
 		fmt.Println("ID:            ", db.ID)
+		if db.Group != "" {
+			fmt.Println("Group:         ", db.Group)
+		}
 		if db.Version != "" {
 			fmt.Println("Version:       ", db.Version)
 		}

diff --git a/internal/cmd/utils.go b/internal/cmd/utils.go
@@ -273,21 +273,6 @@ func dbNameAndOrgArgs(cmd *cobra.Command, args []string, toComplete string) ([]s
 	return dbNameArg(cmd, args, toComplete)
 }
 
-func isSQLiteFile(file *os.File) (bool, error) {
-	defer file.Seek(0, io.SeekStart)
-	header := make([]byte, 16)
-	_, err := file.Read(header)
-	if err != nil && err != io.EOF {
-		return false, err
-	}
-
-	if string(header) == "SQLite format 3\000" {
-		return true, nil
-	}
-
-	return false, nil
-}
-
 func fetchLatestVersion() (string, error) {
 	client, err := createUnauthenticatedTursoClient()
 	if err != nil {