From 149fde9438c59bd98ab8479ba46ae9db70ffb109 Mon Sep 17 00:00:00 2001
From: Cy Brown <cy.brown59@gmail.com>
Date: Thu, 23 Jul 2015 22:52:56 +0200
Subject: [PATCH] mariasql: Added string based function signature and MariaInfo
 interface

---
 mariasql/mariasql-tests.ts |  3 +++
 mariasql/mariasql.d.ts     | 35 ++++++++++++++++++++++++-----------
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/mariasql/mariasql-tests.ts b/mariasql/mariasql-tests.ts
index c9173058c..76819feba 100644
--- a/mariasql/mariasql-tests.ts
+++ b/mariasql/mariasql-tests.ts
@@ -92,6 +92,9 @@ c.query('SELECT * FROM users WHERE id = ? AND name = ?',
                 console.log('Result error: ' + inspect(err));
             })
             .on('end', function (info) {
+                console.log(info.affectedRows);
+                console.log(info.insertId);
+                console.log(info.numRows);
                 console.log('Result finished successfully');
             });
     })
diff --git a/mariasql/mariasql.d.ts b/mariasql/mariasql.d.ts
index 05d7fa062..9eb80068f 100644
--- a/mariasql/mariasql.d.ts
+++ b/mariasql/mariasql.d.ts
@@ -24,6 +24,10 @@ declare module mariasql {
         (result:Object):void
     }
 
+    export interface MariaCallBackInfo {
+        (result:MariaInfo):void
+    }
+
     export interface MariaCallBackVoid {
         ():void
     }
@@ -32,6 +36,12 @@ declare module mariasql {
         [index: string]: any;
     }
 
+    export interface MariaInfo {
+        affectedRows: number;
+        insertId: number;
+        numRows: number
+    }
+
     export interface MariaPreparedQuery {
         (values:Dictionary):string;
         (values:Array<any>):string;
@@ -57,18 +67,20 @@ declare module mariasql {
     }
 
     export interface MariaResult {
-        on(signal:string, cb:MariaCallBackObject):MariaResult; // signal 'end'
-        on(signal:string, cb:MariaCallBackError):MariaResult;  // signal 'error'
-        on(signal:string, cb:MariaCallBackRow):MariaResult;    // signal 'row'
-        on(signal:string, cb:MariaCallBackVoid):MariaResult;   // signal 'abort'
+        on(signal:'end', cb:MariaCallBackInfo):MariaResult;
+        on(signal:'error', cb:MariaCallBackError):MariaResult;
+        on(signal:'row', cb:MariaCallBackRow):MariaResult;
+        on(signal:'abort', cb:MariaCallBackVoid):MariaResult;
+        on(signal:string, cb:MariaCallBackVoid):MariaResult;
         abort():void;
     }
 
     export interface MariaQuery {
-        on(signal:string, cb:MariaCallBackResult):MariaQuery; // signal 'result'
-        on(signal:string, cb:MariaCallBackVoid):MariaQuery;   // signal 'end'
-        on(signal:string, cb:MariaCallBackVoid):MariaQuery;   // signal 'abort'
-        on(signal:string, cb:MariaCallBackError):MariaQuery;  // signal 'error'
+        on(signal:'result', cb:MariaCallBackResult):MariaQuery;
+        on(signal:'end', cb:MariaCallBackVoid):MariaQuery;
+        on(signal:'abort', cb:MariaCallBackVoid):MariaQuery;
+        on(signal:'error', cb:MariaCallBackError):MariaQuery;
+        on(signal:string, cb:MariaCallBackVoid):MariaQuery;
         abort():void;
     }
 
@@ -82,9 +94,10 @@ declare module mariasql {
         query(q:string, useArray?:boolean):MariaQuery;
         prepare(query:string): MariaPreparedQuery;
         isMariaDB():boolean;
-        on(signal:string, cb:MariaCallBackError): MariaClient;    // signal 'error'
-        on(signal:string, cb:MariaCallBackObject): MariaClient;   // signal 'close'
-        on(signal:string, cb:MariaCallBackVoid): MariaClient;     // signal 'connect'
+        on(signal:'error', cb:MariaCallBackError): MariaClient;
+        on(signal:'close', cb:MariaCallBackObject): MariaClient;
+        on(signal:'connect', cb:MariaCallBackVoid): MariaClient;
+        on(signal:string, cb:MariaCallBackVoid): MariaClient;
         connected: boolean;
         threadId: string;
     }