;;;; Authors: Aurelio Bignoli, Kevin Rosenberg, Marcus Pearce
;;;; Created: Aug 2003
;;;;
-;;;; $Id$
-;;;;
;;;; This file, part of CLSQL, is Copyright (c) 2003 by Aurelio Bignoli and
-;;;; Copyright (c) 2003-2004 by Kevin Rosenberg and Marcus Pearce.
+;;;; Copyright (c) 2003-2010 by Kevin Rosenberg and Marcus Pearce.
;;;;
;;;; CLSQL users are granted the rights to distribute and use this software
;;;; as governed by the terms of the Lisp Lesser GNU Public License
(when (> n-col 0)
(when field-names
(setf col-names (loop for i from 0 below n-col
- collect (sqlite:sqlite-aref sqlite-col-names i))))
+ collect (sqlite:sqlite-aref sqlite-col-names i (encoding database)))))
(let ((canonicalized-result-types
(canonicalize-result-types result-types n-col sqlite-col-names)))
(flet ((extract-row-data (row)
(loop for i from 0 below n-col
collect (clsql-uffi:convert-raw-field
(sqlite:sqlite-raw-aref row i)
- canonicalized-result-types i))))
+ (nth i canonicalized-result-types)
+ :encoding (encoding database)))))
(push (extract-row-data new-row) rows)
;; Read subsequent rows.
do (setf (car rest)
(clsql-uffi:convert-raw-field
(sqlite:sqlite-raw-aref row i)
- result-types
- i)))
+ (nth i result-types)
+ :encoding (encoding database))))
(sqlite:sqlite-free-row row)
t))))