projects
/
clsql.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version 5.0.0: International character sets support
[clsql.git]
/
db-mysql
/
mysql-sql.lisp
diff --git
a/db-mysql/mysql-sql.lisp
b/db-mysql/mysql-sql.lisp
index 0ca15cfe3a3cf11d4e907011138cdc87669a555f..4bf3543a29b380c07476db0e91818fd65c1de4e1 100644
(file)
--- a/
db-mysql/mysql-sql.lisp
+++ b/
db-mysql/mysql-sql.lisp
@@
-6,7
+6,7
@@
;;;; Purpose: High-level MySQL interface using UFFI
;;;; Date Started: Feb 2002
;;;;
;;;; Purpose: High-level MySQL interface using UFFI
;;;; Date Started: Feb 2002
;;;;
-;;;; This file, part of CLSQL, is Copyright (c) 2002-20
09
by Kevin M. Rosenberg
+;;;; This file, part of CLSQL, is Copyright (c) 2002-20
10
by Kevin M. Rosenberg
;;;;
;;;; CLSQL users are granted the rights to distribute and use this software
;;;; as governed by the terms of the Lisp Lesser GNU Public License
;;;;
;;;; CLSQL users are granted the rights to distribute and use this software
;;;; as governed by the terms of the Lisp Lesser GNU Public License
@@
-20,12
+20,6
@@
(in-package #:clsql-mysql)
(in-package #:clsql-mysql)
-;; if we have :sb-unicode, UFFI will treat :cstring as a UTF-8 string
-(defun expression-length (query-expression)
- (length #+sb-unicode (sb-ext:string-to-octets query-expression
- :external-format :utf8)
- #-sb-unicode query-expression))
-
;;; Field conversion functions
(defun result-field-names (res-ptr)
;;; Field conversion functions
(defun result-field-names (res-ptr)
@@
-165,7
+159,7
@@
:mysql-ptr mysql-ptr))
(cmd "SET SESSION sql_mode='ANSI'"))
(uffi:with-cstring (cmd-cs cmd)
:mysql-ptr mysql-ptr))
(cmd "SET SESSION sql_mode='ANSI'"))
(uffi:with-cstring (cmd-cs cmd)
- (if (zerop (mysql-real-query mysql-ptr cmd-cs (
expression-length
cmd)))
+ (if (zerop (mysql-real-query mysql-ptr cmd-cs (
uffi:foreign-encoded-string-octets
cmd)))
db
(progn
(warn "Error setting ANSI mode for MySQL.")
db
(progn
(warn "Error setting ANSI mode for MySQL.")
@@
-183,7
+177,7
@@
(let ((mysql-ptr (database-mysql-ptr database)))
(declare (type mysql-mysql-ptr-def mysql-ptr))
(if (zerop (mysql-real-query mysql-ptr sql-native
(let ((mysql-ptr (database-mysql-ptr database)))
(declare (type mysql-mysql-ptr-def mysql-ptr))
(if (zerop (mysql-real-query mysql-ptr sql-native
- (
expression-length
sql-expression)))
+ (
uffi:foreign-encoded-string-octets
sql-expression)))
t
(error 'sql-database-data-error
:database database
t
(error 'sql-database-data-error
:database database
@@
-515,7
+509,7
@@
:message (mysql-error-string mysql-ptr)))
(uffi:with-cstring (native-query sql-stmt)
:message (mysql-error-string mysql-ptr)))
(uffi:with-cstring (native-query sql-stmt)
- (unless (zerop (mysql-stmt-prepare stmt native-query (
expression-length
sql-stmt)))
+ (unless (zerop (mysql-stmt-prepare stmt native-query (
uffi:foreign-encoded-string-octets
sql-stmt)))
(mysql-stmt-close stmt)
(error 'sql-database-error
:error-id (mysql-errno mysql-ptr)
(mysql-stmt-close stmt)
(error 'sql-database-error
:error-id (mysql-errno mysql-ptr)