Renamed MYSQLPTR to MYSQL, moved constants from types.jl to consts.jl

Author: nkottary

src/MySQL.jl

@@ -2,6 +2,7 @@ module MySQL
     using DBI
 
     include("config.jl")
+    include("consts.jl")
     include("types.jl")
     include("api.jl")
     include("handy.jl")

src/api.jl

@@ -2,7 +2,7 @@
 Initializes the MYSQL object. Must be called before mysql_real_connect.
 Memory allocated by mysql_init can be freed with mysql_close.
 """
-function mysql_init(mysqlptr::MYSQLPTR)
+function mysql_init(mysqlptr::MYSQL)
     return ccall((:mysql_init, mysql_lib),
                  Ptr{Void},
                  (Ptr{Cuchar}, ),
@@ -13,7 +13,7 @@ end
 Used to connect to database server. Returns a MYSQL handle on success and
 C_NULL on failure.
 """
-function mysql_real_connect(mysqlptr::MYSQLPTR,
+function mysql_real_connect(mysqlptr::MYSQL,
                             host::String,
                             user::String,
                             passwd::String,
@@ -55,7 +55,7 @@ Used to set options. Must be called after mysql_init and before
 mysql_real_connect. Can be called multiple times to set options.
 Returns non zero on error.
 """
-function mysql_options(mysqlptr::MYSQLPTR,
+function mysql_options(mysqlptr::MYSQL,
                        option_type::Cuint,
                        option::Ptr{None})
     return ccall((:mysql_options, mysql_lib),
@@ -71,7 +71,7 @@ end
 """
 Close an opened MySQL connection.
 """
-function mysql_close(mysqlptr::MYSQLPTR)
+function mysql_close(mysqlptr::MYSQL)
     return ccall((:mysql_close, mysql_lib),
                  Void,
                  (Ptr{Cuchar}, ),
@@ -81,7 +81,7 @@ end
 """
 Returns the error number of the last API call.
 """
-function mysql_errno(mysqlptr::MYSQLPTR)
+function mysql_errno(mysqlptr::MYSQL)
     return ccall((:mysql_errno, mysql_lib),
                  Cuint,
                  (Ptr{Cuchar}, ),
@@ -92,7 +92,7 @@ end
 Returns a string of the last error message of the most recent function call.
 If no error occured and empty string is returned.
 """
-function mysql_error(mysqlptr::MYSQLPTR)
+function mysql_error(mysqlptr::MYSQL)
     return ccall((:mysql_error, mysql_lib),
                  Ptr{Cuchar},
                  (Ptr{Cuchar}, ),
@@ -123,7 +123,7 @@ end
 Returns the value generated by auto increment column by the previous
 insert / update statement.
 """
-function mysql_insert_id(mysqlptr::MYSQLPTR)
+function mysql_insert_id(mysqlptr::MYSQL)
     return ccall((:mysql_insert_id, mysql_lib),
                  Culong,
                  (Ptr{Cuchar}, ),
@@ -133,7 +133,7 @@ end
 """
 Creates the sql string where the special chars are escaped
 """
-function mysql_real_escape_string(mysqlptr::MYSQLPTR,
+function mysql_real_escape_string(mysqlptr::MYSQL,
                                   to::Vector{Uint8},
                                   from::String,
                                   length::Culong)
@@ -219,7 +219,7 @@ end
 """
 Executes the query and returns the status of the same.
 """
-function mysql_query(mysqlptr::MYSQLPTR, sql::String)
+function mysql_query(mysqlptr::MYSQL, sql::String)
     return ccall((:mysql_query, mysql_lib),
                  Int8,
                  (Ptr{Cuchar}, Ptr{Cuchar}),
@@ -298,25 +298,25 @@ function mysql_affected_rows(results::Ptr{Cuchar})
                  results)
 end
 
-function mysql_autocommit(mysqlptr::MYSQLPTR, mode::Int8)
+function mysql_autocommit(mysqlptr::MYSQL, mode::Int8)
     return ccall((:mysql_autocommit, mysql_lib),
                  Cchar, (Ptr{Void}, Cchar),
                  mysqlptr, mode)
 end
 
-function mysql_change_user(mysqlptr::MYSQLPTR, user::String, passwd::String,
+function mysql_change_user(mysqlptr::MYSQL, user::String, passwd::String,
                            db::String = "")
     return ccall((:mysql_change_user, mysql_lib),
                  Cchar, (Ptr{Void}, Cstring, Cstring, Cstring),
                  mysqlptr, user, passwd, (db == "" ? C_NULL : db))
 end
 
-function mysql_character_set_name(mysqlptr::MYSQLPTR)
+function mysql_character_set_name(mysqlptr::MYSQL)
     return ccall((:mysql_character_set_name, mysql_lib),
                  Cstring, (Ptr{Void},), mysqlptr)
 end
 
-function mysql_commit(mysqlptr::MYSQLPTR)
+function mysql_commit(mysqlptr::MYSQL)
     return ccall((:mysql_commit, mysql_lib), Cchar, (Ptr{Void},), mysqlptr)
 end
 
@@ -326,7 +326,7 @@ function mysql_data_seek(result::MYSQL_RES, offset::Uint64)
                  result, offset-1)
 end
 
-function mysql_dump_debug_info(mysqlptr::MYSQLPTR)
+function mysql_dump_debug_info(mysqlptr::MYSQL)
     return ccall((:mysql_dump_debug_info, mysql_lib),
                  Cint, (Ptr{Void},), mysqlptr)
 end
@@ -335,7 +335,7 @@ function mysql_fetch_lengths(result::MYSQL_RES)
     return ccall((:mysql_fetch_lengths, mysql_lib), Ptr{Cuint}, (Ptr{Void},), result)
 end
 
-function mysql_field_count(mysqlptr::MYSQLPTR)
+function mysql_field_count(mysqlptr::MYSQL)
     return ccall((:mysql_field_count, mysql_lib), Cuint, (Ptr{Void},), mysqlptr)
 end
 
@@ -348,7 +348,7 @@ function mysql_field_tell(result::MYSQL_RES)
     return ccall((:mysql_field_tell, mysql_lib), Cuint, (Ptr{Void},), result)
 end
 
-function mysql_get_character_set_info(mysqlptr::MYSQLPTR)
+function mysql_get_character_set_info(mysqlptr::MYSQL)
     info = _MY_CHARSET_INFO_[_MY_CHARSET_INFO_()]
     ccall((:mysql_get_character_set_info, mysql_lib), Void, (Ptr{Void}, Ref{_MY_CHARSET_INFO_}),
             mysqlptr, info)
@@ -363,31 +363,31 @@ function mysql_get_client_version()
     return ccall((:mysql_get_client_version, mysql_lib), Culong, ())
 end
 
-function mysql_get_host_info(mysqlptr::MYSQLPTR)
+function mysql_get_host_info(mysqlptr::MYSQL)
     return ccall((:mysql_get_host_info, mysql_lib), Ptr{Uint8}, (Ptr{Void},), mysqlptr)
 end
 
-function mysql_get_proto_info(mysqlptr::MYSQLPTR)
+function mysql_get_proto_info(mysqlptr::MYSQL)
     return ccall((:mysql_get_proto_info, mysql_lib), Cuint, (Ptr{Void},), mysqlptr)
 end
 
-function mysql_get_server_info(mysqlptr::MYSQLPTR)
+function mysql_get_server_info(mysqlptr::MYSQL)
     return ccall((:mysql_get_server_info, mysql_lib), Ptr{Uint8}, (Ptr{Void},), mysqlptr)
 end
 
-function mysql_get_server_version(mysqlptr::MYSQLPTR)
+function mysql_get_server_version(mysqlptr::MYSQL)
     return ccall((:mysql_get_server_version, mysql_lib), Culong, (Ptr{Void},), mysqlptr)
 end
 
-function mysql_get_ssl_cipher(mysqlptr::MYSQLPTR)
+function mysql_get_ssl_cipher(mysqlptr::MYSQL)
     return ccall((:mysql_get_ssl_cipher, mysql_lib), Ptr{Uint8}, (Ptr{Void},), mysqlptr)
 end
 
-function mysql_info(mysqlptr::MYSQLPTR)
+function mysql_info(mysqlptr::MYSQL)
     return ccall((:mysql_info, mysql_lib), Ptr{Uint8}, (Ptr{Void},), mysqlptr)
 end
 
-function mysql_kill(mysqlptr::MYSQLPTR, pid::Uint)
+function mysql_kill(mysqlptr::MYSQL, pid::Uint)
     return ccall((:mysql_kill, mysql_lib), Cint, (PTr{Uint8}, Culong),
                                              mysqlptr, pid)
 end
@@ -408,35 +408,35 @@ function mysql_server_init()
                   0, C_NULL, C_NULL)
 end
 
-function mysql_more_results(mysqlptr::MYSQLPTR)
+function mysql_more_results(mysqlptr::MYSQL)
     retval = ccall((:mysql_more_results, mysql_lib), Cchar, (Ptr{Void},), mysqlptr)
     return retval == 1
 end
 
-function mysql_next_result(mysqlptr::MYSQLPTR)
+function mysql_next_result(mysqlptr::MYSQL)
     return ccall((:mysql_next_result, mysql_lib), Cint, (Ptr{Void},),
                  mysqlptr)
 end
 
-function mysql_ping(mysqlptr::MYSQLPTR)
+function mysql_ping(mysqlptr::MYSQL)
     return ccall((:mysql_ping, mysql_lib), Cint, (Ptr{Void},), mysqlptr)
 end
 
-function mysql_real_query(mysqlptr::MYSQLPTR, query::Vector{Uint8})
+function mysql_real_query(mysqlptr::MYSQL, query::Vector{Uint8})
     return ccall((:mysql_real_query, mysql_lib), Cint, (Ptr{Void}, Ptr{Uint8}, Culong),
                  mysqlptr, query, length(query))
 end
 
-function mysql_real_query(mysqlptr::MYSQLPTR, query::Ptr{Cuchar})
+function mysql_real_query(mysqlptr::MYSQL, query::Ptr{Cuchar})
     return mysql_real_query(mysqlptr, query)
 end
 
-function mysql_refresh(mysqlptr::MYSQLPTR, options::Uint32)
+function mysql_refresh(mysqlptr::MYSQL, options::Uint32)
     return ccall((:mysql_refresh, mysql_lib), Cchar,
                  (Ptr{Void}, Cuint), mysqlptr, options)
 end
 
-function mysql_rollback(mysqlptr::MYSQLPTR)
+function mysql_rollback(mysqlptr::MYSQL)
     return ccall((:mysql_rollback, mysql_lib), Cchar, (Ptr{Void},), mysqlptr)
 end
 
@@ -449,39 +449,39 @@ function mysql_row_tell(result::MYSQL_RES)
                  result)
 end
 
-function mysql_select_db(mysqlptr::MYSQLPTR, db::String)
+function mysql_select_db(mysqlptr::MYSQL, db::String)
     return ccall((:mysql_select_db, mysql_lib),
                  Cint, (Ptr{Void}, Ptr{Void}), mysqlptr, db)
 end
 
-function mysql_set_character_set(mysqlptr::MYSQLPTR, csname::String)
+function mysql_set_character_set(mysqlptr::MYSQL, csname::String)
     return ccall((:mysql_set_character_set, mysql_lib), Cint, (Ptr{Void}, Ptr{Void}), mysqlptr, csname)
 end
 
-function mysql_set_server_option(mysqlptr::MYSQLPTR, option::Uint32)
+function mysql_set_server_option(mysqlptr::MYSQL, option::Uint32)
     return ccall((:mysql_set_server_option, mysql_lib), Cint, (Ptr{Void}, Cint), mysqlptr, option)
 end
 
-function mysql_sqlstate(mysqlptr::MYSQLPTR)
+function mysql_sqlstate(mysqlptr::MYSQL)
     return ccall((:mysql_sqlstate, mysql_lib), Ptr{Uint8}, (Ptr{Void},), mysqlptr)
 end
 
-function mysql_ssl_set(mysqlptr::MYSQLPTR, key::Ptr{Uint8}=C_NULL, cert::Ptr{Uint8}=C_NULL, ca::Ptr{Uint8}=C_NULL,
+function mysql_ssl_set(mysqlptr::MYSQL, key::Ptr{Uint8}=C_NULL, cert::Ptr{Uint8}=C_NULL, ca::Ptr{Uint8}=C_NULL,
               capath::Ptr{Uint8}=C_NULL, cipher::Ptr{Uint8}=C_NULL)
     return ccall((:mysql_ssl_set, mysql_lib),
                  Cchar, (Ptr{Void}, Ptr{Uint8}, Ptr{Uint8}, Ptr{Uint8}, Ptr{Uint8}, Ptr{Uint8}),
                  mysqlptr, key, cert, ca, capath, cipher)
 end
 
-function mysql_stat(mysqlptr::MYSQLPTR)
+function mysql_stat(mysqlptr::MYSQL)
     return ccall((:mysql_stat, mysql_lib), Ptr{Uint8}, (Ptr{Void},), mysqlptr)
 end
 
 function mysql_thread_end()
     return ccall((:mysql_thread_end, mysql_lib), Void, ())
 end
 
-function mysql_thread_id(mysqlptr::MYSQLPTR)
+function mysql_thread_id(mysqlptr::MYSQL)
     return ccall((:mysql_thread_id, mysql_lib), Culong, (Ptr{Void},), mysqlptr)
 end
 
@@ -493,12 +493,12 @@ function mysql_thread_safe()
     return ccall((:mysql_thread_safe, mysql_lib), Cint, ())
 end
 
-function mysql_use_result(mysqlptr::MYSQLPTR)
+function mysql_use_result(mysqlptr::MYSQL)
     return ccall((:mysql_use_result, mysql_lib), Ptr{Void}, (Ptr{Void},),
                  mysqlptr)
 end
 
-function mysql_warning_count(mysqlptr::MYSQLPTR)
+function mysql_warning_count(mysqlptr::MYSQL)
     return ccall((:mysql_warning_count, mysql_lib), Cuint, (Ptr{Void},),
                  mysqlptr)
 end