projects
/
clsql.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r9323: * db-mysql/mysql-api.lisp: Fix int vs. long slots in foreign
[clsql.git]
/
db-postgresql-socket
/
postgresql-socket-api.lisp
diff --git
a/db-postgresql-socket/postgresql-socket-api.lisp
b/db-postgresql-socket/postgresql-socket-api.lisp
index fe31cedd1424c9b183d59f2510d7275f1ca659dc..620140ee718c0872aab75515bba8a0db4a2ad699 100644
(file)
--- a/
db-postgresql-socket/postgresql-socket-api.lisp
+++ b/
db-postgresql-socket/postgresql-socket-api.lisp
@@
-27,13
+27,13
@@
(:float4 700)
(:float8 701)))
(:float4 700)
(:float8 701)))
-(defmethod clsql-base
-sys
:database-type-library-loaded ((database-type
+(defmethod clsql-base:database-type-library-loaded ((database-type
(eql :postgresql-socket)))
"T if foreign library was able to be loaded successfully. Always true for
socket interface"
t)
(eql :postgresql-socket)))
"T if foreign library was able to be loaded successfully. Always true for
socket interface"
t)
-(defmethod clsql-base
-sys
:database-type-load-foreign ((database-type (eql :postgresql-socket)))
+(defmethod clsql-base:database-type-load-foreign ((database-type (eql :postgresql-socket)))
t)
t)
@@
-220,13
+220,14
@@
socket interface"
(unless *crypt-library-loaded*
(uffi:load-foreign-library
(uffi:find-foreign-library "libcrypt"
(unless *crypt-library-loaded*
(uffi:load-foreign-library
(uffi:find-foreign-library "libcrypt"
- '("/usr/lib/" "/usr/local/lib/" "/lib/"))
+ '(#+64bit "/usr/lib64/"
+ "/usr/lib/" "/usr/local/lib/" "/lib/"))
:supporting-libraries '("c"))
(setq *crypt-library-loaded* t)))
(in-package :postgresql-socket)
:supporting-libraries '("c"))
(setq *crypt-library-loaded* t)))
(in-package :postgresql-socket)
-(uffi:def-function
"crypt"
+(uffi:def-function
("crypt" crypt)
((key :cstring)
(salt :cstring))
:returning :cstring)
((key :cstring)
(salt :cstring))
:returning :cstring)
@@
-560,8
+561,7
@@
connection, if it is still open."
(force-output (postgresql-connection-socket connection)))
(defun wait-for-query-results (connection)
(force-output (postgresql-connection-socket connection)))
(defun wait-for-query-results (connection)
- (asse
-rt (postgresql-connection-open-p connection))
+ (assert (postgresql-connection-open-p connection))
(let ((socket (postgresql-connection-socket connection))
(cursor-name nil)
(error nil))
(let ((socket (postgresql-connection-socket connection))
(cursor-name nil)
(error nil))
@@
-601,8
+601,9
@@
rt (postgresql-connection-open-p connection))
:connection connection :message message))))
(#.+notice-response-message+
(let ((message (read-socket-value-string socket)))
:connection connection :message message))))
(#.+notice-response-message+
(let ((message (read-socket-value-string socket)))
- (warn 'postgresql-warning
- :connection connection :message message)))
+ (unless (eq :ignore clsql-base:*backend-warning-behavior*)
+ (warn 'postgresql-warning
+ :connection connection :message message))))
(#.+notification-response-message+
(let ((pid (read-socket-value-int32 socket))
(message (read-socket-value-string socket)))
(#.+notification-response-message+
(let ((pid (read-socket-value-int32 socket))
(message (read-socket-value-string socket)))