From 4f562b1706cfdae66a74df298d0938151390f7a6 Mon Sep 17 00:00:00 2001
From: Will Johnston <will@getplatypi.com>
Date: Sun, 3 Aug 2014 16:44:58 -0500
Subject: [PATCH] Fixed mysql tests

---
 mysql/mysql-tests.ts | 6 +++---
 mysql/mysql.d.ts     | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/mysql/mysql-tests.ts b/mysql/mysql-tests.ts
index 81f1e7766..83fdeb06a 100644
--- a/mysql/mysql-tests.ts
+++ b/mysql/mysql-tests.ts
@@ -109,7 +109,7 @@ sql = mysql.format(sql, inserts);
 
 connection.config.queryFormat = function (query, values) {
     if (!values) return query;
-    return query.replace(/\:(\w+)/g, function (txt, key) {
+    return query.replace(/\:(\w+)/g, function (txt: string, key: string) {
         if (values.hasOwnProperty(key)) {
             return this.escape(values[key]);
         }
@@ -173,7 +173,7 @@ pool.on('connection', function (connection) {
     connection.query('SET SESSION auto_increment_increment=1')
 });
 
-pool.getConnection(function (err, connection: mysql.IConnection) {
+pool.getConnection(function (err, connection) {
     // Use the connection
     connection.query('SELECT something FROM sometable', function (err, rows) {
         // And done with the connection.
@@ -368,7 +368,7 @@ var query = connection.query({ sql: '...', typeCast: false }, function (err, res
 
 connection.query({
     sql: '...',
-    typeCast: function (field, next) {
+    typeCast: function (field: any, next: Function) {
         if (field.type == 'TINY' && field.length == 1) {
             return (field.string() == '1'); // 1 = true, 0 = false
         }
diff --git a/mysql/mysql.d.ts b/mysql/mysql.d.ts
index 3df338e47..479b05266 100644
--- a/mysql/mysql.d.ts
+++ b/mysql/mysql.d.ts
@@ -44,7 +44,6 @@ declare module mysql {
         query: IQueryFunction;
 
         end(): void;
-        end(options: any): void;
         end(callback: (err: IError, ...args: any[]) => void): void;
         end(options: any, callback: (err: IError, ...args: any[]) => void): void;