r10801: 4 Nov 2005 Kevin Rosenberg <kevin@rosenberg.net>

        * 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 cf2e75c95951013e05ceff0fa1d637dedc65f243..87a47a9bce6802469b214bed7eae7a45bd056f96 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+4 Nov 2005  Kevin Rosenberg <kevin@rosenberg.net>
+       * 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 <kevin@rosenberg.net>
        * Version 3.3.3
        * sql/oodml.lisp: Apply patch from Drew Crampsie to fix
 30 Oct 2005  Kevin Rosenberg <kevin@rosenberg.net>
        * 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 51eb3f1239900ee8e0fb857f82cc2d49f2ff616a..7541934ae4b01c408879d4c4bb4ab850ec7cdc4d 100644 (file)
--- a/clsql-uffi.asd
+++ b/clsql-uffi.asd
@@ -18,11 +18,6 @@
 
 (in-package cl-user)
 
 
 (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)
 
 (defpackage clsql-uffi-system (:use #:asdf #:cl))
 (in-package clsql-uffi-system)
 

diff --git a/clsql.asd b/clsql.asd
index 74f837680515f33c9e562eb22dfbd50e1ff5e937..c70fd787e5c8696dc3d8093715527f3dbae134f6 100644 (file)
--- a/clsql.asd
+++ b/clsql.asd
@@ -18,6 +18,11 @@
 (defpackage #:clsql-system (:use #:asdf #:cl))
 (in-package #:clsql-system)
 
 (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 <kevin@rosenberg.net>"
 (defsystem clsql
     :name "CLSQL"
     :author "Kevin Rosenberg <kevin@rosenberg.net>"


@@ -85,6 +90,8 @@ oriented interface."
   (operate 'test-op 'clsql-tests :force t))
 
 (defmethod perform :after ((o load-op) (c (eql (find-system 'clsql))))
   (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 eb68f205b42c32ce248b6f1a217c389a992f75ad..0dcefa4090491a558299e624ca9586389fd7d2d7 100644 (file)
--- 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)
 
 (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)
     (with-error-handling
       (:henv henv)
       (SQLAllocHandle $SQL_HANDLE_DBC henv phdbc)