Fix and minimal refactoring of the master build

.gitignore

@@ -1,3 +1,5 @@
+.idea/
+
 # Compiled Object files, Static and Dynamic libs (Shared Objects)
 *.o
 *.a

.travis.yml

@@ -1,21 +1,15 @@
 language: go
-sudo: false
+os: linux
 addons:
-  postgresql: 9.4
+  postgresql: "9.4"
 go:
-  - 1.8
-  - 1.9
+  - "1.11"
   - tip
 cache:
   directories:
   - samples
 install:
-  - go get github.com/codegangsta/cli
-  - go get github.com/lib/pq
-  - go get github.com/kennygrant/sanitize
-  - go get github.com/cheggaaa/pb
-  - go get github.com/JensRantil/go-csv
   - ./download_samples.sh
 script:
-  - go install && ./test.sh
-  - go test
+  - env GO111MODULE=on go install github.com/lukasmartinelli/pgfutter && ./test.sh
+  - env GO111MODULE=on go test -v github.com/lukasmartinelli/pgfutter

Dockerfile

@@ -0,0 +1,17 @@
+FROM golang:alpine AS DOWNLOAD
+
+WORKDIR /app
+COPY ./download_samples.sh /app/download_samples.sh
+RUN sh /app/download_samples.sh
+
+FROM golang:alpine
+
+WORKDIR /app
+COPY ./ /app
+ENV GO111MODULE=on
+
+COPY --from=DOWNLOAD /app/samples /app/samples
+RUN apk update && apk add postgresql-client
+RUN go install github.com/lukasmartinelli/pgfutter
+
+CMD ["/bin/sh", "/app/test.sh"]

csv.go

@@ -125,7 +125,7 @@ func copyCSVRows(i *Import, reader *csv.Reader, ignoreErrors bool,
 }
 
 func importCSV(filename string, connStr string, schema string, tableName string, ignoreErrors bool,
-	skipHeader bool, fields string, delimiter string, excel bool, nullDelimiter string) error {
+	skipHeader bool, fields string, delimiter string, excel bool, nullDelimiter string, lineTerminator string) error {
 
 	db, err := connect(connStr, schema)
 	if err != nil {
@@ -138,12 +138,16 @@ func importCSV(filename string, connStr string, schema string, tableName string,
 
 	// Excel 2008 and 2011 and possibly other versions uses a carriage return \r
 	// rather than a line feed \n as a newline
-	if excel {
-		dialect.LineTerminator = "\r"
-	} else {
-		dialect.LineTerminator = "\n"
-	}
 
+	dialect.LineTerminator = lineTerminator
+	if dialect.LineTerminator == "" {
+		if excel {
+			dialect.LineTerminator = "\r"
+		} else {
+			dialect.LineTerminator = "\n"
+		}
+	}
+
 	var reader *csv.Reader
 	var bar *pb.ProgressBar
 	if filename != "" {

docker-compose.yaml

@@ -0,0 +1,19 @@
+version: "3"
+services:
+  postgres:
+    image: postgres:latest
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: secret
+    logging:
+      driver: none
+
+  test:
+    build:
+      context: .
+    environment:
+      DB_USER: postgres
+      PGPASSWORD: secret
+      DB_HOST: postgres
+    depends_on:
+      - postgres

download_samples.sh

@@ -5,7 +5,7 @@ SAMPLES_DIR="$CWD/samples"
 function download_json_samples() {
     mkdir -p $SAMPLES_DIR
     cd $SAMPLES_DIR
-    wget -nc wget -nc https://github.com/lukasmartinelli/pgfutter/releases/download/v0.1-alpha/json_sample_2015-01-01-15.json
+    wget -nc https://github.com/lukasmartinelli/pgfutter/releases/download/v0.1-alpha/json_sample_2015-01-01-15.json
     cd $CWD
 }
 

go.mod

@@ -0,0 +1,13 @@
+module github.com/lukasmartinelli/pgfutter
+
+go 1.14
+
+require (
+	github.com/JensRantil/go-csv v0.0.0-20191126162552-aff1990e884a
+	github.com/cheggaaa/pb v1.0.29
+	github.com/kennygrant/sanitize v1.2.4
+	github.com/lib/pq v1.8.0
+	github.com/urfave/cli v1.22.4
+	github.com/urfave/cli/v2 v2.2.0
+	golang.org/x/net v0.0.0-20200822124328-c89045814202 // indirect
+)

go.sum

@@ -0,0 +1,41 @@
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/JensRantil/go-csv v0.0.0-20191126162552-aff1990e884a h1:fywL1sHHCOgztiCwVQTonfyM1IR6B2lciAu3rthl3Y4=
+github.com/JensRantil/go-csv v0.0.0-20191126162552-aff1990e884a/go.mod h1:Ym6iV3U8nw0LeBLakDn42VdNggbAxPSlZH1G6dtkAO0=
+github.com/cheggaaa/pb v1.0.29 h1:FckUN5ngEk2LpvuG0fw1GEFx6LtyY2pWI/Z2QgCnEYo=
+github.com/cheggaaa/pb v1.0.29/go.mod h1:W40334L7FMC5JKWldsTWbdGjLo0RxUKK73K+TuPxX30=
+github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY=
+github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
+github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
+github.com/kennygrant/sanitize v1.2.4 h1:gN25/otpP5vAsO2djbMhF/LQX6R7+O1TB4yv8NzpJ3o=
+github.com/kennygrant/sanitize v1.2.4/go.mod h1:LGsjYYtgxbetdg5owWB2mpgUL6e2nfw2eObZ0u0qvak=
+github.com/lib/pq v1.8.0 h1:9xohqzkUwzR4Ga4ivdTcawVS89YSDVxXMa3xJX3cGzg=
+github.com/lib/pq v1.8.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
+github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
+github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
+github.com/mattn/go-runewidth v0.0.4 h1:2BvfKmzob6Bmd4YsL0zygOqfdFnK7GR4QL06Do4/p7Y=
+github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q=
+github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
+github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
+github.com/urfave/cli v1.22.4 h1:u7tSpNPPswAFymm8IehJhy4uJMlUuU/GmqSkvJ1InXA=
+github.com/urfave/cli v1.22.4/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
+github.com/urfave/cli/v2 v2.2.0 h1:JTTnM6wKzdA0Jqodd966MVj4vWbbquZykeX1sKbe2C4=
+github.com/urfave/cli/v2 v2.2.0/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20200822124328-c89045814202 h1:VvcQYSHwXgi7W+TpUR6A9g6Up98WAHf3f/ulnJ62IyA=
+golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 h1:YyJpGZS1sBuBCzLAR1VEpK193GlqGZbnPFnPV/5Rsb4=
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd h1:xhmwyvizuTgC2qz7ZlMluP20uW+C3Rm0FD/WLDX8884=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=