merge conflict resolve

Author: xdenser

.travis.yml

@@ -30,6 +30,16 @@ before_script:
   - mkdir test_db
   - cd test_db
   - sudo isql-fb -input ../../tests/createTestDB.sql
-  - sudo chmod 0666 TEST.FDB
+  - sudo chmod -c 0666 TEST.FDB
+  - sudo chmod -v a+x /home/travis/build/xdenser/node-firebird-libfbclient/build/test_db
+  - sudo chmod -v a+x /home/travis/build/xdenser/node-firebird-libfbclient/build
+  - sudo chmod -v a+x /home/travis/build/xdenser/node-firebird-libfbclient
+  - sudo chmod -v a+x /home/travis/build/xdenser
+  - sudo chmod -v a+x /home/travis/build
+  - sudo chmod -v a+x /home/travis
+  - sudo chmod -v a+x /home
+  - pwd
+  - ls -l
   - cd ../..
+  - sleep 5
 

appveyor.yml

@@ -2,7 +2,7 @@
 
 # Test against these versions of Io.js and Node.js.
 environment:
-  fb_download: https://www.dropbox.com/s/i9h93c813nrvt26/fb25.7z?dl=1
+  fb_download: https://www.dropbox.com/s/3qghi5u6e652fn6/fb25.7z?dl=1
   fb_start: .\bin\fb_inet_server.exe -a -m
   matrix:
   # lts

src/fb-bindings-connection.h

@@ -9,7 +9,7 @@
 
 #define MAX_USERNAME_LENGTH 31
 #define MAX_ROLENAME_LENGTH 31
-#define MAX_PASSWORD_LENGTH 8 
+#define MAX_PASSWORD_LENGTH 20 
 
 #include <uv.h>
 #include "./fb-bindings.h"

tests/def/test-async.js

@@ -12,9 +12,14 @@ var
 
 
 exports.AsyncConnection = function (test) {
-  test.expect(4);
+  test.expect(5);
   var conn = fb_binding.createConnection();
-  conn.connect(cfg.db, cfg.user, cfg.password, cfg.role, function(err){
+  conn.connect(cfg.db, cfg.user, cfg.password, cfg.role, function(cerr){
+     test.ok(!cerr,"No Error");
+     if(cerr) {
+       console.error(cerr);
+       return;
+     }
      test.ok(conn.connected,"Connected to database");
      conn.query("select * from rdb$relations", function(err,res){
          test.ok(!err,"No Error");