ready for next release

dbcli.sh

@@ -62,9 +62,9 @@ if [[ "$_java" ]]; then
     fi
 fi
 
-chmod  777 ./jre_$os/bin/* &>/dev/null
+
 if [[ $found < 2 ]]; then
-    if [[ -x ./jre_$os/bin/java ]];  then
+    if [[ -f ./jre_$os/bin/unpack200 ]];  then
         _java=./jre_$os/bin/java
         ver="52"
     else
@@ -102,8 +102,11 @@ if [[ "$os" = mac* ]]; then
 fi
 # unpack jar files for the first use
 unpack="$JAVA_ROOT/bin/unpack200"
-if [[ -x ./jre_$os/bin/unpack200 ]]; then
+if [[ -f ./jre_$os/bin/unpack200 ]]; then
     unpack=./jre_$os/bin/unpack200
+    if [ ! -x "$unpack" ]; then
+        chmod  +x ./jre_$os/bin/* &>/dev/null
+    fi
 elif [ ! -x "$unpack" ]; then
     echo "Cannot find unpack200 executable, exit."
     popd
@@ -118,6 +121,6 @@ wait
 
 trap '' TSTP &>/dev/null
 
-chmod  777 ./lib/$os/luajit &>/dev/null
+chmod  +x ./lib/$os/luajit &>/dev/null
 exec -a "dbcli" ./lib/$os/luajit ./lib/bootstrap.lua "$_java" "$ver" "$@"
 popd

lib/misc.lua

@@ -190,7 +190,13 @@ if not table.unpack then table.unpack=function(tab) return unpack(tab) end end
 local system=java.system
 local clocker=system.currentTimeMillis
 function os.timer()
-    return clocker()/1000
+    local uv=env.luv
+    if uv and uv.now then
+        uv.update_time()
+        return uv.now()
+    else
+        return clocker()/1000
+    end
 end
 
 function string.from(v)

lua/db_core.lua

@@ -1052,7 +1052,12 @@ function db_core:connect(attrs,data_source)
     env.checkerr(err,tostring(res))
 
     self.conn=res
-    env.checkerr(self.conn,"Unable to connect to db!")
+
+    if type(res)~="userdata" or not self:is_connect() then
+        self.conn=nil
+        env.raise("Unable to connect to database, connection !")
+    end
+
     self.autocommit=cfg.get("AUTOCOMMIT")
     self.conn:setAutoCommit(self.autocommit=="on" and true or false)
     if event then