X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=sql%2Fsql.cl;h=a0fc83315979adc7bc549abdc7b02ae4f33866ba;hb=d211aedbcb8ab72a35ec8a457bba2e368da97ba3;hp=1c02d6651f93482b082de77af99cdfb7762c341c;hpb=e596bda48686fd7df4fe7cb2740cd2144a22fb79;p=clsql.git diff --git a/sql/sql.cl b/sql/sql.cl index 1c02d66..a0fc833 100644 --- a/sql/sql.cl +++ b/sql/sql.cl @@ -8,7 +8,7 @@ ;;;; Original code by Pierre R. Mai ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: sql.cl,v 1.5 2002/03/24 22:25:51 kevin Exp $ +;;;; $Id: sql.cl,v 1.7 2002/03/26 14:11:59 kevin Exp $ ;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; and Copyright (c) 1999-2001 by Pierre R. Mai @@ -21,10 +21,13 @@ (declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0))) (in-package :clsql-sys) -;;;; Modified to use CMUCL-COMPAT library and to fix format strings in -;;;; error messages +;;; Modified by KMR +;;; - to use CMUCL-COMPAT library +;;; - fix format strings in error messages +;;; - use field types -;;;; Simple implementation of SQL along the lines of Harlequin's Common SQL + +;;; Simple implementation of SQL along the lines of Harlequin's Common SQL ;;; Conditions (define-condition clsql-condition () @@ -309,14 +312,14 @@ database was disconnected and only one other connection exists." ;;; Basic operations on databases (defmethod query (query-expression &key (database *default-database*) - field-types) + types) "Execute the SQL query expression query-expression on the given database. Returns a list of lists of values of the result of that expression." - (database-query query-expression database field-types)) + (database-query query-expression database types)) -(defgeneric database-query (query-expression database field-types) - (:method (query-expression (database closed-database) field-types) - (declare (ignore query-expression field-types)) +(defgeneric database-query (query-expression database types) + (:method (query-expression (database closed-database) types) + (declare (ignore query-expression types)) (signal-closed-database-error database)) (:documentation "Internal generic implementation of query.")) @@ -333,9 +336,9 @@ Returns true on success or nil on failure." ;;; Mapping and iteration (defgeneric database-query-result-set - (query-expression database &key full-set field-types) - (:method (query-expression (database closed-database) &key full-set field-types) - (declare (ignore query-expression full-set field-types)) + (query-expression database &key full-set types) + (:method (query-expression (database closed-database) &key full-set types) + (declare (ignore query-expression full-set types)) (signal-closed-database-error database) (values nil nil nil)) (:documentation @@ -371,7 +374,7 @@ returns nil when result-set is finished.")) (defun map-query (output-type-spec function query-expression &key (database *default-database*) - (field-types nil)) + (types nil)) "Map the function over all tuples that are returned by the query in query-expression. The results of the function are collected as specified in output-type-spec and returned like in MAP." @@ -383,21 +386,21 @@ specified in output-type-spec and returned like in MAP." `(if (atom ,type) ,type (car ,type)))) (case (type-specifier-atom output-type-spec) ((nil) - (map-query-for-effect function query-expression database field-types)) + (map-query-for-effect function query-expression database types)) (list - (map-query-to-list function query-expression database field-types)) + (map-query-to-list function query-expression database types)) ((simple-vector simple-string vector string array simple-array bit-vector simple-bit-vector base-string simple-base-string) - (map-query-to-simple output-type-spec function query-expression database field-types)) + (map-query-to-simple output-type-spec function query-expression database types)) (t (funcall #'map-query (cmucl-compat:result-type-or-lose output-type-spec t) - function query-expression :database database :field-types field-types))))) + function query-expression :database database :types types))))) -(defun map-query-for-effect (function query-expression database field-types) +(defun map-query-for-effect (function query-expression database types) (multiple-value-bind (result-set columns) (database-query-result-set query-expression database :full-set nil - :field-types field-types) + :types types) (when result-set (unwind-protect (do ((row (make-list columns))) @@ -406,10 +409,10 @@ specified in output-type-spec and returned like in MAP." (apply function row)) (database-dump-result-set result-set database))))) -(defun map-query-to-list (function query-expression database field-types) +(defun map-query-to-list (function query-expression database types) (multiple-value-bind (result-set columns) (database-query-result-set query-expression database :full-set nil - :field-types field-types) + :types types) (when result-set (unwind-protect (let ((result (list nil))) @@ -421,10 +424,10 @@ specified in output-type-spec and returned like in MAP." (database-dump-result-set result-set database))))) -(defun map-query-to-simple (output-type-spec function query-expression database field-types) +(defun map-query-to-simple (output-type-spec function query-expression database types) (multiple-value-bind (result-set columns rows) (database-query-result-set query-expression database :full-set t - :field-types field-types) + :types types) (when result-set (unwind-protect (if rows @@ -457,7 +460,7 @@ specified in output-type-spec and returned like in MAP." (defmacro do-query (((&rest args) query-expression &key (database '*default-database*) - (field-types nil)) + (types nil)) &body body) (let ((result-set (gensym)) (columns (gensym)) @@ -466,7 +469,7 @@ specified in output-type-spec and returned like in MAP." `(let ((,db ,database)) (multiple-value-bind (,result-set ,columns) (database-query-result-set ,query-expression ,db - :full-set nil :field-types ,field-types) + :full-set nil :types ,types) (when ,result-set (unwind-protect (do ((,row (make-list ,columns)))