[CR] Use cobra.ExactArgs, SQL IF [NOT] EXISTS

treeverse · Nov 17, 2020 · 6985dba · 6985dba
1 parent 84a50ab
commit 6985dba
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/cmd/lakectl/cmd/export.go b/cmd/lakectl/cmd/export.go
@@ -23,10 +23,8 @@ var exportSetCmd = &cobra.Command{
 	Short: "set continuous export configuration for branch",
 	Long: `Set the entire continuous export configuration for branch.
 Overrides all fields of any previous configuration.`,
+	Args: cobra.ExactArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
-		if len(args) != 1 {
-			Die(`must specify "set <branch uri>"`, 1)
-		}
 		client := getClient()
 		branchURI := uri.Must(uri.Parse(args[0]))
 		exportPath, err := cmd.Flags().GetString("path")
@@ -70,10 +68,8 @@ Last Keys In Prefix Regexp: {{.Configuration.LastKeysInPrefixRegexp}}
 var exportGetCmd = &cobra.Command{
 	Use:   "get <branch uri>",
 	Short: "get continuous export configuration for branch",
+	Args:  cobra.ExactArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
-		if len(args) != 1 {
-			Die(`must specify "get <branch uri>"`, 1)
-		}
 		client := getClient()
 		branchURI := uri.Must(uri.Parse(args[0]))
 		configuration, err := client.GetContinuousExport(context.Background(), branchURI.Repository, branchURI.Ref)

diff --git a/ddl/000012_export_continuous.down.sql b/ddl/000012_export_continuous.down.sql
@@ -0,0 +1 @@
+ALTER TABLE catalog_branches_export DROP COLUMN IF EXISTS continuous;
diff --git a/ddl/000012_export_continuous.up.sql b/ddl/000012_export_continuous.up.sql
@@ -1,6 +1,6 @@
 BEGIN;
 
-ALTER TABLE catalog_branches_export ADD COLUMN continuous BOOLEAN;
+ALTER TABLE catalog_branches_export ADD COLUMN IF NOT EXISTS continuous BOOLEAN;
 UPDATE catalog_branches_export SET continuous=false;
 ALTER TABLE catalog_branches_export ALTER COLUMN continuous SET NOT NULL;
 

diff --git a/ddl/0012_export_continuous.down.sql b/ddl/0012_export_continuous.down.sql