removing interface

Author: matttm

database.go

@@ -6,6 +6,7 @@ import (
 	"log"
 	"os"
 
+	"github.com/go-mysql-org/go-mysql/client"
 	_ "github.com/go-sql-driver/mysql"
 )
 
@@ -42,8 +43,18 @@ func InitOverseerConnection() *sql.DB {
 	return InitializeDatabase(user, pass, host, port, dbName)
 }
 
-func InitLocalDatabase() *sql.DB {
-	return InitializeDatabase("root", "root", "localhost", "3306", "IMPOSTER")
+func InitLocalDatabase() *client.Conn {
+	c, err := client.Connect("localhost:3306", "root", "root", "IMPOSTER")
+	if err != nil {
+		fmt.Println("Error while connecting to database")
+		panic(err)
+	}
+	err = c.Ping()
+	if err != nil {
+		fmt.Println("Error while pinging database")
+		panic(err)
+	}
+	return c
 
 }
 func QueryFor(db *sql.DB, query string) []string {
@@ -78,19 +89,19 @@ func QueryForTwoColumns(db *sql.DB, query string) [][2]string {
 	}
 	return props
 }
-func Populate(db *sql.DB, query string, inserts []string) {
-	_, err := db.Exec("USE IMPOSTER")
+func Populate(db *client.Conn, query string, inserts []string) {
+	_, err := db.Execute("USE IMPOSTER")
 	if err != nil {
 		fmt.Println("Error while connecting to database")
 		panic(err)
 	}
-	_, err = db.Exec(query)
+	_, err = db.Execute(query)
 	if err != nil {
 		fmt.Println("Error while connecting to database")
 		panic(err)
 	}
 	for _, ins := range inserts {
-		_, err = db.Exec(ins)
+		_, err = db.Execute(ins)
 		if err != nil {
 			fmt.Println("Error while connecting to database")
 			panic(err)

main.go

@@ -1,11 +1,12 @@
 package main
 
 import (
-	"database/sql"
 	"fmt"
 	"log"
 	"net"
 	"strings"
+
+	"github.com/go-mysql-org/go-mysql/client"
 )
 
 var ()
@@ -15,7 +16,7 @@ type selection struct {
 	table    []string
 }
 
-func handleConn(c net.Conn, tableName string, db *sql.DB) {
+func handleConn(c net.Conn, tableName string, db *client.Conn) {
 	p := InitializeProxy(c, tableName, db)
 
 	log.Printf("new connection: %s\n", c.RemoteAddr())
@@ -56,10 +57,10 @@ func main() {
 	for _, v := range inserts {
 		log.Println(v)
 	}
-	var memdb *sql.DB = InitLocalDatabase()
-	defer memdb.Close()
+	var localDb *client.Conn = InitLocalDatabase()
+	defer localDb.Close()
 	log.Println("Database provider init")
-	Populate(memdb, createCommand, inserts)
+	Populate(localDb, createCommand, inserts)
 
 	// start proxying
 	socket, err := net.Listen("tcp", "127.0.0.1:3307")
@@ -73,7 +74,7 @@ func main() {
 		if err != nil {
 			log.Fatalf("failed to accept connection: %s", err.Error())
 		}
-		go handleConn(originSocket, s.table[0], memdb)
+		go handleConn(originSocket, s.table[0], localDb)
 	}
 
 }

proxy.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"database/sql"
 	"fmt"
 	"log"
 	"net"
@@ -14,11 +13,11 @@ import (
 type Proxy struct {
 	server  *server.Conn // proxy server-side -- from client to server
 	client  *client.Conn // proxy server0side 00 from server to real db
-	spoof   *sql.DB
+	spoof   *client.Conn
 	spoofed string
 }
 
-func InitializeProxy(c net.Conn, tableName string, db *sql.DB) *Proxy {
+func InitializeProxy(c net.Conn, tableName string, db *client.Conn) *Proxy {
 	p := &Proxy{}
 	_client, err := client.Connect(fmt.Sprintf("%s:%d", host, 3306), user, pass, "")
 	if err != nil {

remote-handler.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"database/sql"
 	"fmt"
 	"log"
 	"strings"
@@ -12,11 +11,11 @@ import (
 
 type ProxyRequestHandler struct {
 	remoteDb *client.Conn
-	spoof    *sql.DB
+	spoof    *client.Conn
 	spoofed  string
 }
 
-func NewRemoteHandler(c *client.Conn, t string, db *sql.DB) ProxyRequestHandler {
+func NewRemoteHandler(c *client.Conn, t string, db *client.Conn) ProxyRequestHandler {
 	return ProxyRequestHandler{remoteDb: c, spoofed: t, spoof: db}
 }
 
@@ -38,6 +37,8 @@ func (h ProxyRequestHandler) HandleQuery(query string) (*mysql.Result, error) {
 		return nil, nil
 	}
 	if strings.Contains(query, h.spoofed) {
+		r, err := h.spoof.Execute(query)
+		return r, err
 	}
 	res, err := h.remoteDb.Execute(query)