fixed bug nuintun#2

Author: nuintun

.gitignore

@@ -216,3 +216,6 @@ pip-log.txt
 
 #node modules
 node_modules
+
+#WebStorm
+.idea

lib/adodb.js

@@ -18,7 +18,7 @@ var JSON = (function (){
             '\\': '\\\\'
         };
 
-    // string quote
+    // String quote
     function quote(string){
         escapable.lastIndex = 0;
         return escapable.test(string) ? '"' + string.replace(escapable, function (a){
@@ -108,7 +108,7 @@ var JSON = (function (){
         }
     }
 
-    // stringify method
+    // Stringify method
     JSON.stringify = function (value, replacer, space){
         var i;
         gap = '';
@@ -125,14 +125,14 @@ var JSON = (function (){
         rep = replacer;
         if (replacer && typeof replacer !== 'function' &&
             (typeof replacer !== 'object' ||
-                typeof replacer.length !== 'number')) {
+            typeof replacer.length !== 'number')) {
             throw new Error('JSON.stringify');
         }
 
-        return str('', {'': value});
+        return str('', { '': value });
     };
 
-    // parse method
+    // Parse method
     JSON.parse = function (text, reviver){
         var j;
 
@@ -164,14 +164,14 @@ var JSON = (function (){
         }
 
         if (/^[\],:{}\s]*$/
-            .test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@')
-                .replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']')
-                .replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
+                .test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@')
+                    .replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']')
+                    .replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
 
             j = eval('(' + text + ')');
 
             return typeof reviver === 'function'
-                ? walk({'': j}, '')
+                ? walk({ '': j }, '')
                 : j;
         }
 
@@ -184,6 +184,7 @@ var JSON = (function (){
 /**
  * 64位字符解码
  * http://blog.csdn.net/cuixiping/article/details/409468
+ * @private
  * @param base64
  * @returns {*}
  */
@@ -207,7 +208,7 @@ function base64Decode(base64){
     stream = null;
     adostream = null;
     xmldom = null;
-    
+
     return result;
 }
 
@@ -231,10 +232,13 @@ var ADODB = {
         try {
             connection.Open(params.connection);
             connection.Execute(params.query);
-            connection = null;
         } catch (e) {
             valid = false;
             message = e.message;
+        } finally {
+            // 关闭数据库链接，不管有没有操作成功
+            connection.Close();
+            connection = null;
         }
 
         stdout({
@@ -243,16 +247,14 @@ var ADODB = {
         });
     },
     query: function (params){
-        var valid = true, records = [],
+        var enumer, fields = [],
+            valid = true, records = [],
             message = 'Execute SQL: ' + params.query + ' Success !',
-            connection = new ActiveXObject('ADODB.Connection');
+            connection = new ActiveXObject('ADODB.Connection'),
+            recordset = new ActiveXObject('ADODB.Recordset');
 
         try {
             connection.Open(params.connection);
-            var enumer,
-                fields = [],
-                recordset = new ActiveXObject('ADODB.Recordset');
-
             recordset.Open(params.query, connection);
             enumer = new Enumerator(recordset.Fields);
 
@@ -264,6 +266,7 @@ var ADODB = {
                 }
 
                 recordset.MoveFirst();
+
                 while (!recordset.EOF) {
                     var item = {};
                     for (var i = 0; i < fields.length; i++) {
@@ -274,13 +277,16 @@ var ADODB = {
                     recordset.MoveNext();
                 }
             }
-
-            recordset.Close();
-            recordset = null;
-            connection = null;
         } catch (e) {
             valid = false;
             message = e.message;
+        } finally {
+            // 关闭数据库链接，不管有没有操作成功
+            recordset.Close();
+            connection.Close();
+            enumer = null;
+            recordset = null;
+            connection = null;
         }
 
         stdout({

package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-adodb",
-    "version": "1.0.3",
+    "version": "1.1.0",
     "main": "index.js",
     "license": "MIT",
     "keywords": [