From a33175f8396cc948094ba4a2ea3a54fec3e11066 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Fri, 10 Sep 2004 04:26:46 +0000 Subject: [PATCH] r9988: Automated commit for Debian build of clsql upstream-version-3.0.4 --- ChangeLog | 5 +++++ db-odbc/odbc-api.lisp | 20 ++++++++++---------- db-odbc/odbc-ff-interface.lisp | 6 +++--- db-oracle/oracle-sql.lisp | 8 ++++---- debian/changelog | 12 ++++++++++++ sql/generic-odbc.lisp | 1 + 6 files changed, 35 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index fa9a562..0a6cbcd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +09 Sep 2004 Kevin Rosenberg + * Version 3.0.4 Release + * multiple: Remove superfluous quotes in UFFI def-type + and def-foreign-type forms. + 07 Sep 2004 Kevin Rosenberg * Version 3.0.3 Release * db-postgresql-socket/postgresql-socket-api.lisp: Commit patch diff --git a/db-odbc/odbc-api.lisp b/db-odbc/odbc-api.lisp index aa5bbbc..3b1beb0 100644 --- a/db-odbc/odbc-api.lisp +++ b/db-odbc/odbc-api.lisp @@ -576,13 +576,13 @@ as possible second argument) to the desired representation of date/time/timestam (#.$SQL_TINYINT $SQL_C_STINYINT) (#.$SQL_BIT $SQL_C_BIT))) -(def-type byte-pointer-type '(* :byte)) -(def-type short-pointer-type '(* :short)) -(def-type int-pointer-type '(* :int)) -(def-type long-pointer-type '(* #.$ODBC-LONG-TYPE)) -(def-type float-pointer-type '(* :float)) -(def-type double-pointer-type '(* :double)) -(def-type string-pointer-type '(* :unsigned-char)) +(def-type byte-pointer-type (* :byte)) +(def-type short-pointer-type (* :short)) +(def-type int-pointer-type (* :int)) +(def-type long-pointer-type (* #.$ODBC-LONG-TYPE)) +(def-type float-pointer-type (* :float)) +(def-type double-pointer-type (* :double)) +(def-type string-pointer-type (* :unsigned-char)) (defun get-cast-byte (ptr) (locally (declare (type byte-pointer-type ptr)) @@ -900,9 +900,9 @@ as possible second argument) to the desired representation of date/time/timestam (read-from-string str)) str)))))) -(def-type c-timestamp-ptr-type '(* (:struct sql-c-timestamp))) -(def-type c-time-ptr-type '(* (:struct sql-c-time))) -(def-type c-date-ptr-type '(* (:struct sql-c-date))) +(def-type c-timestamp-ptr-type (* (:struct sql-c-timestamp))) +(def-type c-time-ptr-type (* (:struct sql-c-time))) +(def-type c-date-ptr-type (* (:struct sql-c-date))) (defun timestamp-to-universal-time (ptr) (declare (type c-timestamp-ptr-type ptr)) diff --git a/db-odbc/odbc-ff-interface.lisp b/db-odbc/odbc-ff-interface.lisp index d26648c..00e7cd6 100644 --- a/db-odbc/odbc-ff-interface.lisp +++ b/db-odbc/odbc-ff-interface.lisp @@ -19,9 +19,9 @@ (in-package #:odbc) (def-foreign-type sql-handle :pointer-void) -(def-foreign-type sql-handle-ptr '(* sql-handle)) -(def-foreign-type string-ptr '(* :unsigned-char)) -(def-type long-ptr-type '(* #.$ODBC-LONG-TYPE)) +(def-foreign-type sql-handle-ptr (* sql-handle)) +(def-foreign-type string-ptr (* :unsigned-char)) +(def-type long-ptr-type (* #.$ODBC-LONG-TYPE)) ;; odbc v3 (def-function "SQLAllocHandle" diff --git a/db-oracle/oracle-sql.lisp b/db-oracle/oracle-sql.lisp index 0348068..dc2c98b 100644 --- a/db-oracle/oracle-sql.lisp +++ b/db-oracle/oracle-sql.lisp @@ -64,7 +64,7 @@ likely that we'll have to worry about the CMUCL limit.")) ;;; database. Thus, there's no obstacle to having any number of DB ;;; objects referring to the same database. -(uffi:def-type pointer-pointer-void '(* :pointer-void)) +(uffi:def-type pointer-pointer-void (* :pointer-void)) (defclass oracle-database (database) ; was struct db ((envhp @@ -339,9 +339,9 @@ the length of that format.") ;; STREAM which has no more data, and QC is not a STREAM, we signal ;; DBI-ERROR instead. -(uffi:def-type short-array '(:array :short)) -(uffi:def-type int-pointer '(* :int)) -(uffi:def-type double-pointer '(* :double)) +(uffi:def-type short-array (:array :short)) +(uffi:def-type int-pointer (* :int)) +(uffi:def-type double-pointer (* :double)) ;;; the result of a database query: a cursor through a table (defstruct (oracle-result-set (:print-function print-query-cursor) diff --git a/debian/changelog b/debian/changelog index ac6919b..a031264 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +cl-sql (3.0.4-2) unstable; urgency=low + + * New upstream + + -- Kevin M. Rosenberg Thu, 9 Sep 2004 22:26:28 -0600 + +cl-sql (3.0.4-1) unstable; urgency=low + + * New upstream + + -- Kevin M. Rosenberg Thu, 9 Sep 2004 22:21:42 -0600 + cl-sql (3.0.3-1) unstable; urgency=low * New upstream diff --git a/sql/generic-odbc.lisp b/sql/generic-odbc.lisp index 5d82fdd..eb3430f 100644 --- a/sql/generic-odbc.lisp +++ b/sql/generic-odbc.lisp @@ -27,6 +27,7 @@ (defmethod initialize-instance :after ((db generic-odbc-database) &rest all-keys) + (declare (ignore all-keys)) (unless (slot-boundp db 'dbi-package) (error "dbi-package not specified.")) (let ((pkg (slot-value db 'dbi-package))) -- 2.34.1