adding schema name

Author: matttm

database.go

@@ -89,18 +89,18 @@ func QueryForTwoColumns(db *sql.DB, query string) [][2]string {
 	}
 	return props
 }
-func Populate(db *client.Conn, query string, inserts []string) {
-	_, err := db.Execute("DROP DATABASE IF EXISTS IMPOSTER")
+func Populate(db *client.Conn, dbName, query string, inserts []string) {
+	_, err := db.Execute(DROP_DB(dbName))
 	if err != nil {
 		fmt.Println("Error while dropping imposter database")
 		panic(err)
 	}
-	_, err = db.Execute("CREATE DATABASE IMPOSTER")
+	_, err = db.Execute(CREATE_DB(dbName))
 	if err != nil {
 		fmt.Println("Error while creating imposter database")
 		panic(err)
 	}
-	_, err = db.Execute("USE IMPOSTER")
+	_, err = db.Execute(USE_DB(dbName))
 	if err != nil {
 		fmt.Println("Error while using database")
 		panic(err)

main.go

@@ -60,7 +60,7 @@ func main() {
 	var localDb *client.Conn = InitLocalDatabase()
 	defer localDb.Close()
 	log.Println("Database provider init")
-	Populate(localDb, createCommand, inserts)
+	Populate(localDb, s.database[0], createCommand, inserts)
 
 	// start proxying
 	socket, err := net.Listen("tcp", "127.0.0.1:3307")

query.go

@@ -18,4 +18,13 @@ var (
 	SELECT_COLUMNS = func(tableName string) string {
 		return fmt.Sprintf("SELECT COLUMN_NAME, DATA_TYPE FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='%s';", tableName)
 	}
+	DROP_DB = func(dbName string) string {
+		return fmt.Sprintf("DROP DATABASE IF EXISTS %s", dbName)
+	}
+	CREATE_DB = func(dbName string) string {
+		return fmt.Sprintf("CREATE DATABASE %s", dbName)
+	}
+	USE_DB = func(dbName string) string {
+		return fmt.Sprintf("USE %s", dbName)
+	}
 )

sql-manipulator.go

@@ -8,7 +8,7 @@ import (
 
 func CreateSelectInsertionFromSchema(schemaName, tableName string, columns [][2]string) string {
 	var sb strings.Builder
-	write(&sb, `SELECT CONCAT('INSERT INTO %s.%s SET ', `, "IMPOSTER" /*schschemaName*/, tableName)
+	write(&sb, `SELECT CONCAT('INSERT INTO %s.%s SET ', `, schemaName, tableName)
 	for i, v := range columns {
 		name := v[0]
 		_type := v[1]