X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=db-mysql%2Fmysql-api.lisp;h=39af26f02add0b6c128957947042b2f4d445a86c;hb=9d6ec50020109467ff766ad753a4194ee756b1b9;hp=31828ca296dd99449ddf35ab19371e36bda7edbb;hpb=635fd6df23f5cdc0247ec93dfdb04e1be670412e;p=clsql.git diff --git a/db-mysql/mysql-api.lisp b/db-mysql/mysql-api.lisp index 31828ca..39af26f 100644 --- a/db-mysql/mysql-api.lisp +++ b/db-mysql/mysql-api.lisp @@ -4,8 +4,8 @@ ;;;; ;;;; Name: mysql-api.lisp ;;;; Purpose: Low-level MySQL interface using UFFI -;;;; Programmers: Kevin M. Rosenberg based on -;;;; Original code by Pierre R. Mai +;;;; Programmers: Kevin M. Rosenberg based on +;;;; Original code by Pierre R. Mai ;;;; Date Started: Feb 2002 ;;;; ;;;; $Id$ @@ -27,7 +27,7 @@ ;;;; that are used in a few routines. ;;;; - Removed all references to interiors of C-structions, this will ;;;; increase robustness when MySQL's internal structures change. - + ;;;; Type definitions ;;; Basic Types @@ -132,10 +132,10 @@ (decimals :unsigned-int) (type mysql-field-types)) -#+mysql-client-v4.1 +#+(or mysql-client-v4.1 mysql-client-v5) (uffi:def-struct mysql-field (name (* :char)) - (org_table (* :char)) + (org_name (* :char)) (table (* :char)) (org_table (* :char)) (db (* :char)) @@ -155,6 +155,18 @@ (charsetnr :unsigned-int) (type mysql-field-types)) + +(uffi:def-struct mysql-time + (year :unsigned-int) + (month :unsigned-int) + (day :unsigned-int) + (hour :unsigned-int) + (minute :unsigned-int) + (second :unsigned-int) + (second-part :unsigned-long) + (neg mysql-bool) + (time-type :int)) + ;;; MYSQL-ROWS (uffi:def-array-pointer mysql-row (* :unsigned-char)) @@ -208,7 +220,7 @@ :read-default-group)) (uffi:def-enum mysql-status - (:ready + (:ready :get-result :use-result)) @@ -264,13 +276,13 @@ (handle (:struct-pointer mysql-mysql)) (eof mysql-bool)) -#+mysql-client-4.1 +#+(or mysql-client-v4.1 mysql-client-v5) (uffi:def-enum mysql-field-types - (:ready + (:ready :get-result :use-result)) -#+mysql-client-v4.1 +#+(or mysql-client-v4.1 mysql-client-v5) (uffi:def-struct mysql-bind (length (* :unsigned-long)) (is-null (* mysql-bool)) @@ -294,17 +306,6 @@ (declaim (inline mysql-init)) (uffi:def-function "mysql_init" ((mysql (* mysql-mysql))) - :module "mysql" - :returning (* mysql-mysql)) - -#-mysql-client-v4 -(declaim (inline mysql-connect)) -#-mysql-client-v4 -(uffi:def-function "mysql_connect" - ((mysql (* mysql-mysql)) - (host :cstring) - (user :cstring) - (passwd :cstring)) :module "mysql" :returning (* mysql-mysql)) @@ -354,24 +355,6 @@ :module "mysql" :returning :int) -#-mysql-client-v4 -(declaim (inline mysql-create-db)) -#-mysql-client-v4 -(uffi:def-function "mysql_create_db" - ((mysql (* mysql-mysql)) - (db :cstring)) - :module "mysql" - :returning :int) - -#-mysql-client-v4 -(declaim (inline mysql-drop-db)) -#-mysql-client-v4 -(uffi:def-function "mysql_drop_db" - ((mysql (* mysql-mysql)) - (db :cstring)) - :module "mysql" - :returning :int) - (declaim (inline mysql-shutdown)) (uffi:def-function "mysql_shutdown" ((mysql (* mysql-mysql))) @@ -529,8 +512,8 @@ (declaim (inline mysql-escape-string)) (uffi:def-function "mysql_escape_string" - ((to :cstring) - (from :cstring) + ((to (* :unsigned-char)) + (from (* :unsigned-char)) (length :unsigned-int)) :module "mysql" :returning :unsigned-int) @@ -548,16 +531,16 @@ :module "clsql-mysql" :returning :unsigned-int) -#+mysql-client-v4.1 +#+(or mysql-client-v4.1 mysql-client-v5) (uffi:def-foreign-type mysql-stmt-ptr :pointer-void) -#+mysql-client-v4.1 +#+(or mysql-client-v4.1 mysql-client-v5) (uffi:def-function "mysql_stmt_init" ((res (* mysql-mysql-res))) :module "clsql-mysql" :returning mysql-stmt-ptr) -#+mysql-client-v4.1 +#+(or mysql-client-v4.1 mysql-client-v5) (uffi:def-function "mysql_stmt_prepare" ((stmt mysql-stmt-ptr) (query :cstring) @@ -565,64 +548,70 @@ :module "clsql-mysql" :returning :int) -#+mysql-client-v4.1 +#+(or mysql-client-v4.1 mysql-client-v5) (uffi:def-function "mysql_stmt_param_count" ((stmt mysql-stmt-ptr)) :module "clsql-mysql" :returning :unsigned-int) -#+mysql-client-v4.1 +#+(or mysql-client-v4.1 mysql-client-v5) (uffi:def-function "mysql_stmt_bind_param" ((stmt mysql-stmt-ptr) (bind (* mysql-bind))) :module "clsql-mysql" :returning :short) -#+mysql-client-v4.1 +#+(or mysql-client-v4.1 mysql-client-v5) (uffi:def-function "mysql_stmt_bind_result" ((stmt mysql-stmt-ptr) (bind (* mysql-bind))) :module "clsql-mysql" :returning :short) -#+mysql-client-v4.1 +#+(or mysql-client-v4.1 mysql-client-v5) (uffi:def-function "mysql_stmt_result_metadata" ((stmt mysql-stmt-ptr)) :module "clsql-mysql" :returning (* mysql-mysql-res)) -#+mysql-client-v4.1 +#+(or mysql-client-v4.1 mysql-client-v5) (uffi:def-function "mysql_stmt_execute" ((stmt mysql-stmt-ptr)) :module "clsql-mysql" :returning :int) -#+mysql-client-v4.1 +#+(or mysql-client-v4.1 mysql-client-v5) +(uffi:def-function "mysql_stmt_store_result" + ((stmt mysql-stmt-ptr)) + :module "clsql-mysql" + :returning :int) + +#+(or mysql-client-v4.1 mysql-client-v5) (uffi:def-function "mysql_stmt_fetch" ((stmt mysql-stmt-ptr)) :module "clsql-mysql" :returning :int) -#+mysql-client-v4.1 +#+(or mysql-client-v4.1 mysql-client-v5) (uffi:def-function "mysql_stmt_free_result" ((stmt mysql-stmt-ptr)) :module "clsql-mysql" :returning :short) -#+mysql-client-v4.1 +#+(or mysql-client-v4.1 mysql-client-v5) (uffi:def-function "mysql_stmt_close" ((stmt mysql-stmt-ptr)) :module "clsql-mysql" :returning :short) -#+mysql-client-v4.1 +#+(or mysql-client-v4.1 mysql-client-v5) (uffi:def-function "mysql_stmt_errno" ((stmt mysql-stmt-ptr)) :module "clsql-mysql" :returning :unsigned-int) -#+mysql-client-v4.1 +#+(or mysql-client-v4.1 mysql-client-v5) (uffi:def-function "mysql_stmt_error" ((stmt mysql-stmt-ptr)) :module "clsql-mysql" @@ -672,11 +661,11 @@ (declaim (inline mysql-num-fields)) -(uffi:def-function "mysql_num_fields" +(uffi:def-function "mysql_num_fields" ((res (* mysql-mysql-res))) :returning :unsigned-int :module "mysql") - + (declaim (inline clsql-mysql-eof)) (uffi:def-function ("mysql_eof" clsql-mysql-eof) ((res (* mysql-mysql-res)))