r11418: 30 Dec 2006 Kevin Rosenberg <kevin@rosenberg.net>

        * Version 3.8.0: BACKWARD INCOMPATABLE CHANGE!
        * db-postgresql/postgresql-{api,loader,sql,package}.lisp:
        Apply patch from Edi Weitz to avoid conflict with new Lispworks 5
        POSTGRESQL package name. CLSQL's new package will be PGSQL, however
        on non-Lispworks platforms, the nickname POSTGRESQL will still be
        available. Applications directly using low-level POSTGRESQL package
        are recommended to use the new PGSQL name.
        * db-oracle/oracle-{api,sql}.lisp, sql/{expressions,loop-extension}.lisp,
        Apply patch from Edi Weitz to reduce compiler warnings.

diff --git a/ChangeLog b/ChangeLog
index c0e40cfae0b18364194f183621975012a81d90b5..f936b6def34ba72db691ea281ef8c1ae583256ed 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+30 Dec 2006  Kevin Rosenberg <kevin@rosenberg.net>
+       * Version 3.8.0: BACKWARD INCOMPATABLE CHANGE!
+       * db-postgresql/postgresql-{api,loader,sql,package}.lisp:
+       Apply patch from Edi Weitz to avoid conflict with new Lispworks 5
+       POSTGRESQL package name. CLSQL's new package will be PGSQL, however
+       on non-Lispworks platforms, the nickname POSTGRESQL will still be
+       available. Applications directly using low-level POSTGRESQL package
+       are recommended to use the new PGSQL name.
+       * db-oracle/oracle-{api,sql}.lisp, sql/{expressions,loop-extension}.lisp,
+       Apply patch from Edi Weitz to reduce compiler warnings.
+       
 28 Dec 2006  Kevin Rosenberg <kevin@rosenberg.net>
        * Version 3.7.9
        * sql/expressions.lisp: Commit patch from Edi Weitz to

diff --git a/NEWS b/NEWS
index a640d8d7d89f1b5529d7c592e611fcc16ad335e3..0a101dea20e3248beb1a523ca0ed3691ecfd92b5 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+Dec 30 2006
+-----------
+Version 3.8.0 released with incompatible backward change. See
+the ChangeLog entry for details.
+
+
+Aug 3 2006
+----------
 CLSQL 3.0 has been released. The 3.0 release of CLSQL is a major
 rewrite compared to version 2.0. New features include:
 

diff --git a/db-oracle/oracle-api.lisp b/db-oracle/oracle-api.lisp
index 3b0a7ee431c8f9c0b9ac2dae38850427af720971..19b3f6e37f98d7861b3bfa9d9d9bcdc6d5323297 100644 (file)
--- a/db-oracle/oracle-api.lisp
+++ b/db-oracle/oracle-api.lisp
@@ -75,6 +75,7 @@
                             ,c-parms
                           :returning ,c-return)))
        (defun ,lisp-oci-fn (,@ll &key database nulls-ok)
+         (declare (ignore database nulls-ok))
         (funcall %lisp-oci-fn ,@ll)))))
 
 

diff --git a/db-oracle/oracle-sql.lisp b/db-oracle/oracle-sql.lisp
index fc3188f8b33a4e510c916e0b87ac8baa27f61317..3f5cb4961b25f6e36981e5349387f72918f84460 100644 (file)
--- a/db-oracle/oracle-sql.lisp
+++ b/db-oracle/oracle-sql.lisp
@@ -643,7 +643,6 @@ the length of that format.")
                                (colname '(* :unsigned-char))
                                (colnamelen 'ub4)
                                (colsize 'ub2)
-                               (colsizesize 'ub4)
                                (defnp ':pointer-void))
       (let ((buffer nil)
            (sizeof nil))

diff --git a/db-postgresql/postgresql-api.lisp b/db-postgresql/postgresql-api.lisp
index e01828cc8e369d0d2c15b238aaf606fa259bc47d..47894913f421d53db4eb20c5e69eece65d668675 100644 (file)
--- a/db-postgresql/postgresql-api.lisp
+++ b/db-postgresql/postgresql-api.lisp
@@ -18,7 +18,7 @@
 ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
-(in-package #:postgresql)
+(in-package #:pgsql)
 
 
 ;;;; This file implements as little of the FFI bindings to the

diff --git a/db-postgresql/postgresql-loader.lisp b/db-postgresql/postgresql-loader.lisp
index 8124bb924029cedc4f59e236fc0e367dd5b0dbfe..f98aec691bfedd26fe4a90c0654af57dc7f169d0 100644 (file)
--- a/db-postgresql/postgresql-loader.lisp
+++ b/db-postgresql/postgresql-loader.lisp
@@ -16,7 +16,7 @@
 ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
-(in-package #:postgresql)
+(in-package #:pgsql)
 
 
 (defvar *postgresql-supporting-libraries* '("crypt" "c")

diff --git a/db-postgresql/postgresql-package.lisp b/db-postgresql/postgresql-package.lisp
index 080eaf96ad5ca6a568bf3f0e1bd57905355f731d..c6ba65b30e9547dc5ee67f3ef90f33c4c7ceba6d 100644 (file)
--- a/db-postgresql/postgresql-package.lisp
+++ b/db-postgresql/postgresql-package.lisp
@@ -18,8 +18,9 @@
 
 (in-package #:cl-user)
 
-(defpackage #:postgresql
-    (:nicknames #:pgsql)
+(defpackage #:pgsql
+    #-(and :lispworks (not :lispworks4))
+    (:nicknames #:postgresql)
     (:use #:cl #:clsql-uffi)
     (:export
      #:pgsql-oid

diff --git a/db-postgresql/postgresql-sql.lisp b/db-postgresql/postgresql-sql.lisp
index 82f03e2454a0d63fff2ddfb4822fd96f31169d9d..a3f9b885f442c41b6296ebc1740afeb5d2567127 100644 (file)
--- a/db-postgresql/postgresql-sql.lisp
+++ b/db-postgresql/postgresql-sql.lisp
@@ -16,7 +16,7 @@
 (in-package #:cl-user)
 
 (defpackage #:clsql-postgresql
-    (:use #:common-lisp #:clsql-sys #:postgresql #:clsql-uffi)
+    (:use #:common-lisp #:clsql-sys #:pgsql #:clsql-uffi)
     (:export #:postgresql-database)
     (:documentation "This is the CLSQL interface to PostgreSQL."))
 
@@ -306,7 +306,7 @@
 
 (defmethod database-create-large-object ((database postgresql-database))
   (lo-create (database-conn-ptr database)
-            (logior postgresql::+INV_WRITE+ postgresql::+INV_READ+)))
+            (logior pgsql::+INV_WRITE+ pgsql::+INV_READ+)))
 
 
 #+mb-original
@@ -318,7 +318,7 @@
     (with-transaction (:database database)
        (unwind-protect
          (progn 
-           (setf fd (lo-open ptr object-id postgresql::+INV_WRITE+))
+           (setf fd (lo-open ptr object-id pgsql::+INV_WRITE+))
            (when (>= fd 0)
              (when (= (lo-write ptr fd data length) length)
                (setf result t))))
@@ -336,7 +336,7 @@
     (database-execute-command "begin" database)
     (unwind-protect
        (progn 
-         (setf fd (lo-open ptr object-id postgresql::+INV_WRITE+))
+         (setf fd (lo-open ptr object-id pgsql::+INV_WRITE+))
          (when (>= fd 0)
            (when (= (lo-write ptr fd data length) length)
              (setf result t))))
@@ -357,7 +357,7 @@
     (unwind-protect
        (progn
         (database-execute-command "begin" database)
-        (setf fd (lo-open ptr object-id postgresql::+INV_READ+))
+        (setf fd (lo-open ptr object-id pgsql::+INV_READ+))
         (when (>= fd 0)
           (setf length (lo-lseek ptr fd 0 2))
           (lo-lseek ptr fd 0 0)
@@ -429,7 +429,7 @@
       (coerce-string db)
       (coerce-string user)
       (let ((connection (PQsetdbLogin host port options tty db user password)))
-        (declare (type postgresql::pgsql-conn-ptr connection))
+        (declare (type pgsql::pgsql-conn-ptr connection))
         (unless (eq (PQstatus connection)
                    pgsql-conn-status-type#connection-ok)
           ;; Connect failed

diff --git a/debian/changelog b/debian/changelog
index 3d633065f587e1fd342bb0f1b0933dfabf1cb6d3..c68beea2764fc3d5ee6db9655ac96b8e81f0729a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-sql (3.8.0-1) unstable; urgency=low
+
+  * New upstream
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Sat, 30 Dec 2006 18:28:40 -0700
+
 cl-sql (3.7.9-1) unstable; urgency=low
 
   * New upstream

diff --git a/sql/expressions.lisp b/sql/expressions.lisp
index cd2d768c6755391dbc36bfe0cae613b8378dffa8..93c97d94d8731924210e6c761b482024c859592e 100644 (file)
--- a/sql/expressions.lisp
+++ b/sql/expressions.lisp
@@ -390,7 +390,7 @@
   (:documentation "An SQL between expression."))
 
 (defmethod output-sql ((expr sql-between-exp) database)
-  (with-slots (name args)
+  (with-slots (args)
       expr
     (output-sql (first args) database)
     (write-string " BETWEEN " *sql-stream*)

diff --git a/sql/loop-extension.lisp b/sql/loop-extension.lisp
index 802533092c71b36a0c5ac8fa1655219ce622c674..b18447a5a8e450a2ad1bbe244b4a8cd8ace9b9d7 100644 (file)
--- a/sql/loop-extension.lisp
+++ b/sql/loop-extension.lisp
@@ -141,7 +141,7 @@
 (defun clsql-loop-method (method-name iter-var iter-var-data-type
                          prep-phrases inclusive? allowed-preps
                          method-specific-data)
-  (declare (ignore method-name inclusive? allowed-preps method-specific-data))
+  (declare (ignore method-name iter-var-data-type inclusive? allowed-preps method-specific-data))
   (let ((in-phrase nil)
        (from-phrase nil))
     (loop for (prep . rest) in prep-phrases