Support jsonobj import command #9

import.go

@@ -68,15 +68,10 @@ func (i *Import) Commit() error {
 		return err
 	}
 
-	err = i.stmt.Close()
-	if err != nil {
-		return err
-	}
+	// Statement might already be closed
+	// therefore ignore errors
+	_ = i.stmt.Close()
 
-	err = i.txn.Commit()
-	if err != nil {
-		return err
-	}
+	return i.txn.Commit()
 
-	return nil
 }

json.go

@@ -6,6 +6,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"io/ioutil"
 	"os"
 )
 
@@ -66,6 +67,37 @@ func copyJSONRows(i *Import, reader *bufio.Reader, ignoreErrors bool) (error, in
 	return nil, success, failed
 }
 
+func importJSONObject(filename string, connStr string, schema string, tableName string) error {
+	db, err := connect(connStr, schema)
+	if err != nil {
+		return err
+	}
+	defer db.Close()
+
+	// The entire file is read into memory because we need to add
+	// it into the PostgreSQL transaction, this will hit memory limits
+	// for big JSON objects
+	bytes, err := ioutil.ReadFile(filename)
+	if err != nil {
+		return err
+	}
+
+	i, err := NewJSONImport(db, schema, tableName, "data")
+	if err != nil {
+		return err
+	}
+
+	// The JSON file is not validated at client side
+	// it is just copied into the database
+	// If the JSON file is corrupt PostgreSQL will complain when querying
+	err = i.AddRow(string(bytes))
+	if err != nil {
+		return err
+	}
+
+	return i.Commit()
+}
+
 func importJSON(filename string, connStr string, schema string, tableName string, ignoreErrors bool) error {
 
 	file, err := os.Open(filename)

pgfutter.go

@@ -87,7 +87,7 @@ func main() {
 	app.Commands = []cli.Command{
 		{
 			Name:  "json",
-			Usage: "Import JSON objects into database",
+			Usage: "Import newline-delimited JSON objects into database",
 			Action: func(c *cli.Context) {
 				cli.CommandHelpTemplate = strings.Replace(cli.CommandHelpTemplate, "[arguments...]", "<json-file>", -1)
 
@@ -106,6 +106,26 @@ func main() {
 				exitOnError(err)
 			},
 		},
+		{
+			Name:  "jsonobj",
+			Usage: "Import single JSON object into database",
+			Action: func(c *cli.Context) {
+				cli.CommandHelpTemplate = strings.Replace(cli.CommandHelpTemplate, "[arguments...]", "<json-file>", -1)
+
+				filename := c.Args().First()
+				if filename == "" {
+					cli.ShowCommandHelp(c, "jsonobj")
+					os.Exit(1)
+				}
+
+				schema := c.GlobalString("schema")
+				tableName := parseTableName(c, filename)
+
+				connStr := parseConnStr(c)
+				err := importJSONObject(filename, connStr, schema, tableName)
+				exitOnError(err)
+			},
+		},
 		{
 			Name:  "csv",
 			Usage: "Import CSV into database",