db: only strict schemas

Author: asdine

cmd/chai/commands/app.go

@@ -19,7 +19,6 @@ func NewApp() *cli.App {
 	app.EnableBashCompletion = true
 
 	app.Commands = []*cli.Command{
-		NewInsertCommand(),
 		NewVersionCommand(),
 		NewDumpCommand(),
 		NewRestoreCommand(),

cmd/chai/commands/insert.go

@@ -3,6 +3,7 @@ package dbutil
 import (
 	"fmt"
 	"io"
+	"strings"
 
 	"github.com/chaisql/chai"
 	"go.uber.org/multierr"
@@ -57,14 +58,35 @@ func dumpTable(tx *chai.Tx, w io.Writer, query, tableName string) error {
 	defer res.Close()
 
 	// Inserts statements.
-	insert := fmt.Sprintf("INSERT INTO %s VALUES", tableName)
 	return res.Iterate(func(r *chai.Row) error {
-		data, err := r.MarshalJSON()
+		cols, err := r.Columns()
 		if err != nil {
 			return err
 		}
 
-		if _, err := fmt.Fprintf(w, "%s %s;\n", insert, string(data)); err != nil {
+		m := make(map[string]interface{}, len(cols))
+		err = r.MapScan(m)
+		if err != nil {
+			return err
+		}
+
+		var sb strings.Builder
+
+		for i, c := range cols {
+			if i > 0 {
+				sb.WriteString(", ")
+			}
+
+			v := m[c]
+			if v == nil {
+				sb.WriteString("NULL")
+				continue
+			}
+
+			fmt.Fprintf(&sb, "%v", v)
+		}
+
+		if _, err := fmt.Fprintf(w, "INSERT INTO %s VALUES (%s);\n", tableName, sb.String()); err != nil {
 			return err
 		}
 
@@ -105,8 +127,8 @@ func dumpSchema(tx *chai.Tx, w io.Writer, query string, tableName string) error
 	// Indexes statements.
 	res, err := tx.Query(`
 		SELECT sql FROM __chai_catalog WHERE 
-			type = 'index' AND owner.table_name = ? OR
-			type = 'sequence' AND owner IS NULL
+			type = 'index' AND owner_table_name = ? OR
+			type = 'sequence' AND owner_table_name IS NULL
 	`, tableName)
 	if err != nil {
 		return err

cmd/chai/dbutil/dump.go

@@ -53,7 +53,7 @@ func TestDump(t *testing.T) {
 					writeToBuf("\n")
 				}
 
-				q := fmt.Sprintf("CREATE TABLE %s (a INTEGER, b ANY, c ANY, ...);", table)
+				q := fmt.Sprintf("CREATE TABLE %s (a INTEGER, b INTEGER, c INTEGER);", table)
 				err = db.Exec(q)
 				assert.NoError(t, err)
 				writeToBuf(q + "\n")
@@ -68,17 +68,17 @@ func TestDump(t *testing.T) {
 				assert.NoError(t, err)
 				writeToBuf(q + "\n")
 
-				q = fmt.Sprintf(`INSERT INTO %s VALUES {"a": %d, "b": %d, "c": %d};`, table, 1, 2, 3)
+				q = fmt.Sprintf(`INSERT INTO %s VALUES (%d, %d, %d);`, table, 1, 2, 3)
 				err = db.Exec(q)
 				assert.NoError(t, err)
 				writeToBuf(q + "\n")
 
-				q = fmt.Sprintf(`INSERT INTO %s VALUES {"a": %d, "b": %d, "c": %d};`, table, 2, 2, 2)
+				q = fmt.Sprintf(`INSERT INTO %s VALUES (%d, %d, %d);`, table, 2, 2, 2)
 				err = db.Exec(q)
 				assert.NoError(t, err)
 				writeToBuf(q + "\n")
 
-				q = fmt.Sprintf(`INSERT INTO %s VALUES {"a": %d, "b": %d, "c": %d};`, table, 3, 2, 1)
+				q = fmt.Sprintf(`INSERT INTO %s VALUES (%d, %d, %d);`, table, 3, 2, 1)
 				err = db.Exec(q)
 				assert.NoError(t, err)
 				writeToBuf(q + "\n")

cmd/chai/dbutil/dump_test.go

@@ -18,7 +18,7 @@ func TestExecSQL(t *testing.T) {
 
 	var got bytes.Buffer
 	err = ExecSQL(context.Background(), db, strings.NewReader(`
-		CREATE TABLE test(a, ...);
+		CREATE TABLE test(a INT, b INT);
 		CREATE INDEX idx_a ON test (a);
 		INSERT INTO test (a, b) VALUES (1, 2), (2, 2), (3, 2);
 		SELECT * FROM test;