Avoid overriding BASE package

Author: nkottary

src/MySQL.jl

@@ -4,7 +4,7 @@ module MySQL
     include("config.jl")
     include("types.jl")
     include("api.jl")
-    include("dbi.jl")
+    include("handy.jl")
 
     export MySQL5
     export MySQLDatabaseHandle

src/dbi.jl

@@ -0,0 +1,53 @@
+# Handy wrappers to functions defined in api.jl.
+
+"""
+A handy function that wraps mysql_init and mysql_real_connect. Also does error
+checking on the pointers returned by init and real_connect.
+"""
+function mysql_connect(host::String,
+                       user::String,
+                       passwd::String,
+                       db::String,
+                       port::Integer = 0,
+                       unix_socket::Any = C_NULL,
+                       client_flag::Integer = 0)
+
+    mysqlptr::Ptr{Cuchar} = C_NULL
+    mysqlptr = mysql_init(mysqlptr)
+
+    if mysqlptr == C_NULL
+        error("Failed to initialize MySQL database")
+    end
+
+    mysqlptr = mysql_real_connect(mysqlptr,
+                                  host,
+                                  user,
+                                  passwd,
+                                  db,
+                                  convert(Cint, port),
+                                  unix_socket,
+                                  convert(Uint64, client_flag))
+
+    if mysqlptr == C_NULL
+        error("Failed to connect to MySQL database")
+    end
+
+    return MySQLDatabaseHandle(mysqlptr, 0)
+end
+
+"""
+Wrapper over mysql_real_connect with CLIENT_MULTI_STATEMENTS passed
+as client flag options.
+"""
+function mysql_connect(hostName::String, userName::String, password::String, db::String)
+    return mysql_connect(hostName, userName, password, db, 0,
+                         C_NULL, MySQL.CLIENT_MULTI_STATEMENTS)
+end
+
+"""
+Wrapper over mysql_close. Must be called to close the connection opened by
+MySQL.mysql_connect.
+"""
+function mysql_disconnect(db::MySQLDatabaseHandle)
+    mysql_close(db.ptr)
+end

src/handy.jl

@@ -81,7 +81,7 @@ function show_as_dataframe()
 end
 
 function run_test()
-    global con = MySQL.connect(HOST, USER, PASSWD, DBNAME)
+    global con = MySQL.mysql_connect(HOST, USER, PASSWD, DBNAME)
     create_table()
 
     insert_values()
@@ -95,7 +95,7 @@ function run_test()
 #    show_as_dataframe()
 
     drop_table()
-    MySQL.disconnect(con)
+    MySQL.mysql_disconnect(con)
 end
 
 run_test()