Surround keys with quotes (#1)

Fix bug with column names needing to be quoted. Thanks @Iwark !

Author: Iwark

README.md

@@ -79,10 +79,12 @@ Here is an example in JSON:
     "keys": ["name", "country_id"],
     "data": [{
       "country_id": 1,
-      "name": "Ile de france"
+      "name": "Ile de france",
+      "order": 10
     }, {
       "country_id": 2,
-      "name": "Tokyo"
+      "name": "Tokyo",
+      "order": 20
     }]
   },
   "prefectures": [{

db/tables.mysql.sql

@@ -1,26 +1,27 @@
 DROP TABLE IF EXISTS countries;
 CREATE TABLE countries(
-  id integer primary key auto_increment,
-  name varchar(255)
+  `id` integer primary key auto_increment,
+  `name` varchar(255)
 );
 
 DROP TABLE IF EXISTS regions;
 CREATE TABLE regions(
-  id integer primary key auto_increment,
-  name varchar(255),
-  country_id int
+  `id` integer primary key auto_increment,
+  `name` varchar(255),
+  `country_id` int,
+  `order` int
 );
 
-CREATE INDEX regions_country_id ON regions (country_id);
+CREATE INDEX regions_country_id ON regions (`country_id`);
 
 DROP TABLE IF EXISTS prefectures;
 CREATE TABLE prefectures(
-  id integer primary key auto_increment,
-  name varchar(255),
-  region_id int
+  `id` integer primary key auto_increment,
+  `name` varchar(255),
+  `region_id` int
 );
 
-CREATE INDEX prefectures_region_id ON prefectures (region_id);
+CREATE INDEX prefectures_region_id ON prefectures (`region_id`);
 
-INSERT INTO countries (name) values ('france');
-INSERT INTO regions (name, country_id) values ('Tokyo', 2);
+INSERT INTO countries (`name`) values ('france');
+INSERT INTO regions (`name`, `country_id`, `order`) values ('Tokyo', 2, 10);

db/tables.postgres.sql

@@ -1,26 +1,27 @@
 DROP TABLE IF EXISTS countries;
 CREATE TABLE countries(
-  id serial primary key,
-  name varchar(255)
+  "id" serial primary key,
+  "name" varchar(255)
 );
 
 DROP TABLE IF EXISTS regions;
 CREATE TABLE regions(
-  id serial primary key,
-  name varchar(255),
-  country_id int
+  "id" serial primary key,
+  "name" varchar(255),
+  "country_id" int,
+  "order" int
 );
 
-CREATE INDEX regions_country_id ON regions (country_id);
+CREATE INDEX regions_country_id ON regions ("country_id");
 
 DROP TABLE IF EXISTS prefectures;
 CREATE TABLE prefectures(
-  id serial primary key,
-  name varchar(255),
-  region_id int
+  "id" serial primary key,
+  "name" varchar(255),
+  "region_id" int
 );
 
-CREATE INDEX prefectures_region_id ON prefectures (region_id);
+CREATE INDEX prefectures_region_id ON prefectures ("region_id");
 
-INSERT INTO countries (name) values ('france');
-INSERT INTO regions (name, country_id) values ('Tokyo', 2);
+INSERT INTO countries ("name") values ('france');
+INSERT INTO regions ("name", "country_id", "order") values ('Tokyo', 2, 10);

db/tables.sqlite3.sql

@@ -1,26 +1,27 @@
 DROP TABLE IF EXISTS countries;
 CREATE TABLE countries(
-  id integer primary key autoincrement,
-  name varchar(255)
+  "id" integer primary key autoincrement,
+  "name" varchar(255)
 );
 
 DROP TABLE IF EXISTS regions;
 CREATE TABLE regions(
-  id integer primary key autoincrement,
-  name varchar(255),
-  country_id int
+  "id" integer primary key autoincrement,
+  "name" varchar(255),
+  "country_id" int,
+  "order" int
 );
 
-CREATE INDEX regions_country_id ON regions (country_id);
+CREATE INDEX regions_country_id ON regions ("country_id");
 
 DROP TABLE IF EXISTS prefectures;
 CREATE TABLE prefectures(
-  id integer primary key autoincrement,
-  name varchar(255),
-  region_id int
+  "id" integer primary key autoincrement,
+  "name" varchar(255),
+  "region_id" int
 );
 
-CREATE INDEX prefectures_region_id ON prefectures (region_id);
+CREATE INDEX prefectures_region_id ON prefectures ("region_id");
 
-INSERT INTO countries (name) values ('france');
-INSERT INTO regions (name, country_id) values ('Tokyo', 2);
+INSERT INTO countries ("name") values ('france');
+INSERT INTO regions ("name", "country_id", "order") values ('Tokyo', 2, 10);

fixtures/002_regions.json.gz

@@ -39,7 +39,7 @@ func (p *Populator) generateCondition(keys []string, data map[string]interface{}
 	var args []interface{}
 	for _, key := range keys {
 		if v, ok := data[key]; ok {
-			conditions = append(conditions, fmt.Sprintf("%s=%s", key, p.getPlaceholder()))
+			conditions = append(conditions, fmt.Sprintf("%s=%s", surroundKeyWithQuote(key, p.Driver), p.getPlaceholder()))
 			args = append(args, v)
 		} else {
 			return "", nil, fmt.Errorf("key %s not found in record %v", key, data)
@@ -49,7 +49,8 @@ func (p *Populator) generateCondition(keys []string, data map[string]interface{}
 }
 
 func (p *Populator) generateSelectQuery(fixture Fixture) (string, []interface{}, error) {
-	query := fmt.Sprintf("SELECT %s FROM %s WHERE ", strings.Join(fixture.Keys, ", "), fixture.TableName)
+	quotedKeys := surroundKeysWithQuotes(fixture.Keys, p.Driver)
+	query := fmt.Sprintf("SELECT %s FROM %s WHERE ", strings.Join(quotedKeys, ", "), fixture.TableName)
 	var conditions []string
 	var args []interface{}
 	for _, data := range fixture.Data {
@@ -87,7 +88,8 @@ func (p *Populator) generateInsertStmt(fixture Fixture, data []map[string]interf
 		args = append(args, recordArgs...)
 	}
 	values := strings.Join(placeholders, ",")
-	return fmt.Sprintf(query, fixture.TableName, strings.Join(keys, ","), values), args
+	quotedKeys := surroundKeysWithQuotes(keys, p.Driver)
+	return fmt.Sprintf(query, fixture.TableName, strings.Join(quotedKeys, ","), values), args
 }
 
 func (p *Populator) getExistingData(fixture Fixture) ([]map[string]interface{}, error) {

populator.go

@@ -1,8 +1,6 @@
 package main
 
-import (
-	"reflect"
-)
+import "reflect"
 
 func contains(key string, slice []string) bool {
 	for _, v := range slice {
@@ -24,6 +22,27 @@ func extractKeys(data []map[string]interface{}) (res []string) {
 	return res
 }
 
+func quoteForDriver(driver string) string {
+	if driver == "mysql" {
+		return "`"
+	}
+	return `"`
+}
+
+func surroundKeysWithQuotes(keys []string, driver string) []string {
+	res := make([]string, len(keys))
+	quote := quoteForDriver(driver)
+	for i, key := range keys {
+		res[i] = quote + key + quote
+	}
+	return res
+}
+
+func surroundKeyWithQuote(key, driver string) string {
+	quote := quoteForDriver(driver)
+	return quote + key + quote
+}
+
 // from stretchr/testify/assert/assertions
 func ObjectsAreEqual(expected, actual interface{}) bool {