Merge pull request #35 from dev-cloverlab/drop-table-only-for-if-json-file-exist

Drop table only for if JSON file exist (as default)

Author: hatajoe

CHANGELOG.md

@@ -1,3 +1,22 @@
+## 0.6.0 (2018-07-05)
+
+### Added
+
+- drop table only for if JSON file exist (as a default)
+
+### Deprecated
+
+- Nothing
+
+### Removed
+
+- Nothing
+
+### Fixed
+
+- Nothing
+
+
 ## 0.5.4 (2018-02-15)
 
 ### Added

builder/builder.go

@@ -8,7 +8,7 @@ import (
 	"github.com/dev-cloverlab/carpenter/dialect/mysql"
 )
 
-func Build(db *sql.DB, old, new *mysql.Table) (queries []string, err error) {
+func Build(db *sql.DB, old, new *mysql.Table, withDrop bool) (queries []string, err error) {
 	if old == nil && new == nil {
 		return queries, fmt.Errorf("err: Both pointer of the specified new and old is nil.")
 	}
@@ -21,8 +21,10 @@ func Build(db *sql.DB, old, new *mysql.Table) (queries []string, err error) {
 	if q := willCreate(old, new); len(q) > 0 {
 		queries = append(queries, q)
 	}
-	if q := willDrop(old, new); len(q) > 0 {
-		queries = append(queries, q)
+	if withDrop {
+		if q := willDrop(old, new); len(q) > 0 {
+			queries = append(queries, q)
+		}
 	}
 	if q := willAlterTableCharacterSet(old, new); len(q) > 0 {
 		queries = append(queries, q)

cmd/carpenter/command/build.go

@@ -15,7 +15,8 @@ import (
 func CmdBuild(c *cli.Context) {
 	// Write your code here
 	dirPath := c.String("dir")
-	queries, errs := makeBuildQueries(dirPath)
+	withDrop := c.Bool("with-drop")
+	queries, errs := makeBuildQueries(dirPath, withDrop)
 	if len(errs) > 0 {
 		panic(fmt.Errorf("err: makeQueries failed for reason\n%s", strings.Join(getErrorMessages(errs), "\n")))
 	}
@@ -24,7 +25,7 @@ func CmdBuild(c *cli.Context) {
 	}
 }
 
-func makeBuildQueries(path string) (queries []string, errs []error) {
+func makeBuildQueries(path string, withDrop bool) (queries []string, errs []error) {
 	files, err := walk(path, ".json")
 	if err != nil {
 		return nil, []error{err}
@@ -73,7 +74,7 @@ func makeBuildQueries(path string) (queries []string, errs []error) {
 		wg.Add(1)
 		go func(o, n *mysql.Table) {
 			defer wg.Done()
-			queries, err := builder.Build(db, o, n)
+			queries, err := builder.Build(db, o, n, withDrop)
 			if err != nil {
 				errCh <- err
 				return

cmd/carpenter/commands.go

@@ -78,6 +78,11 @@ var Commands = []cli.Command{
 				Usage:  "path to JSON file directory (required)",
 				Hidden: false,
 			},
+			cli.BoolFlag{
+				Name:   "with-drop",
+				Usage:  "drop table when if JSON file does not exist",
+				Hidden: false,
+			},
 		},
 	},
 	{

cmd/carpenter/version.go

@@ -1,4 +1,4 @@
 package main
 
 const Name string = "carpenter"
-const Version string = "0.5.4"
+const Version string = "0.6.0"