From: Kevin M. Rosenberg Date: Fri, 4 Nov 2005 19:12:57 +0000 (+0000) Subject: r10801: 4 Nov 2005 Kevin Rosenberg X-Git-Tag: v3.8.6~111 X-Git-Url: http://git.kpe.io/?p=clsql.git;a=commitdiff_plain;h=e4778554b1dc8a130f9b189d760730ce5d76ced4;ds=sidebyside r10801: 4 Nov 2005 Kevin Rosenberg * Version 3.3.4 [UFFI >= 1.5.5 needed] * db-odbc/odbc-api.lisp: Apply patch from Yaroslav Kavenchuk to add missing #\' character. * clsql.asd: Add support for CLSQLINIT environmental variable, based on patch from Yaroslav Kavenchcuk. New version of UFFI required. --- diff --git a/ChangeLog b/ChangeLog index cf2e75c..87a47a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +4 Nov 2005 Kevin Rosenberg + * Version 3.3.4 [UFFI >= 1.5.5 needed] + * db-odbc/odbc-api.lisp: Apply patch from Yaroslav Kavenchuk + to add missing #\' character. + * clsql.asd: Add support for CLSQLINIT environmental variable, + based on patch from Yaroslav Kavenchcuk. New version of UFFI + required. + 30 Oct 2005 Kevin Rosenberg * Version 3.3.3 * sql/oodml.lisp: Apply patch from Drew Crampsie to fix diff --git a/clsql-uffi.asd b/clsql-uffi.asd index 51eb3f1..7541934 100644 --- a/clsql-uffi.asd +++ b/clsql-uffi.asd @@ -18,11 +18,6 @@ (in-package cl-user) -;; need to load uffi for below output-files method -(eval-when (:compile-toplevel :load-toplevel :execute) - (unless (find-package 'uffi) - (asdf:operate 'asdf:load-op 'uffi))) - (defpackage clsql-uffi-system (:use #:asdf #:cl)) (in-package clsql-uffi-system) diff --git a/clsql.asd b/clsql.asd index 74f8376..c70fd78 100644 --- a/clsql.asd +++ b/clsql.asd @@ -18,6 +18,11 @@ (defpackage #:clsql-system (:use #:asdf #:cl)) (in-package #:clsql-system) +;; need to load uffi for below perform :after method +(eval-when (:compile-toplevel :load-toplevel :execute) + (unless (find-package 'uffi) + (asdf:operate 'asdf:load-op 'uffi))) + (defsystem clsql :name "CLSQL" :author "Kevin Rosenberg " @@ -85,6 +90,8 @@ oriented interface." (operate 'test-op 'clsql-tests :force t)) (defmethod perform :after ((o load-op) (c (eql (find-system 'clsql)))) - (when (probe-file "/etc/clsql-init.lisp") - (load "/etc/clsql-init.lisp"))) + (let* ((init-var (uffi:getenv "CLSQLINIT")) + (init-file (or (when init-var (probe-file init-var)) + (probe-file "/etc/clsql-init.lisp")))) + (when init-file (load init-file)))) diff --git a/db-odbc/odbc-api.lisp b/db-odbc/odbc-api.lisp index eb68f20..0dcefa4 100644 --- a/db-odbc/odbc-api.lisp +++ b/db-odbc/odbc-api.lisp @@ -164,7 +164,7 @@ as possible second argument) to the desired representation of date/time/timestam (defun %new-db-connection-handle (henv) (with-foreign-object (phdbc 'sql-handle) - (setf (deref-pointer phdbc sql-handle) +null-handle-ptr+) + (setf (deref-pointer phdbc 'sql-handle) +null-handle-ptr+) (with-error-handling (:henv henv) (SQLAllocHandle $SQL_HANDLE_DBC henv phdbc)