From 6975794cadfe60b408aea09c790793b4caaae428 Mon Sep 17 00:00:00 2001 From: nxshock Date: Tue, 11 Oct 2022 18:03:15 +0500 Subject: [PATCH] Fix database connection and default vales issues --- consts.go | 2 +- main.go | 32 ++++++++++++++++++-------------- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/consts.go b/consts.go index 5fbf589..4762549 100644 --- a/consts.go +++ b/consts.go @@ -1,5 +1,5 @@ package main const ( - VERSION = "0.1.0" + VERSION = "0.1.1" ) diff --git a/main.go b/main.go index decfe9a..1d771d4 100644 --- a/main.go +++ b/main.go @@ -28,9 +28,9 @@ var app = &cli.App{ Required: true, TakesFile: true}, &cli.StringFlag{ - Name: "server", - Usage: "database server address", - DefaultText: "127.0.0.1"}, + Name: "server", + Usage: "database server address", + Value: "127.0.0.1"}, &cli.StringFlag{ Name: "database", Usage: "database name", @@ -44,9 +44,9 @@ var app = &cli.App{ Usage: "list of field types in [sifdt ]+ format", Required: true}, &cli.StringFlag{ - Name: "comma", - Usage: `CSV file comma character (use 't' for tabs)`, - DefaultText: ","}, + Name: "comma", + Usage: `CSV file comma character (use 't' for tabs)`, + Value: ","}, &cli.BoolFlag{ Name: "create", Usage: "create table"}, @@ -55,25 +55,28 @@ var app = &cli.App{ Usage: "overwrite existing table"}, &cli.StringFlag{ Name: "encoding", - Usage: `CSV file charset ("utf8", "win1251")`}, + Usage: `CSV file charset ("utf8", "win1251")`, + Value: "utf8"}, &cli.IntFlag{ Name: "skiprows", Usage: "number of rows to skip before read CSV file header"}, &cli.StringFlag{ - Name: "dateformat", - Usage: "date format (Go style)", - DefaultText: "02.01.2006"}, + Name: "dateformat", + Usage: "date format (Go style)", + Value: "02.01.2006"}, &cli.StringFlag{ - Name: "timestampformat", - Usage: "timestamp format (Go style)", - DefaultText: "02.01.2006 15:04:05"}, + Name: "timestampformat", + Usage: "timestamp format (Go style)", + Value: "02.01.2006 15:04:05"}, &cli.BoolFlag{ Name: "unknowncolumnnames", Usage: "insert to table with unknown column names", }, }, Action: func(c *cli.Context) error { - db, err := sql.Open("sqlserver", fmt.Sprintf("sqlserver://%s?database=%s", c.String("server"), c.String("database"))) + var err error + + db, err = sql.Open("sqlserver", fmt.Sprintf("sqlserver://%s?database=%s", c.String("server"), c.String("database"))) if err != nil { return fmt.Errorf("open database: %v", err) } @@ -107,6 +110,7 @@ func main() { func processReader(c *cli.Context, r io.Reader) error { var encoding Encoding + fmt.Println(c.String("encoding")) err := encoding.UnmarshalText([]byte(c.String("encoding"))) if err != nil { return fmt.Errorf("get decoder: %v", c.String("encoding"))