Set default encoding for sqlite3 databases to utf-8 if unspecified

diff --git a/ChangeLog b/ChangeLog
index fad7f77c3f50983e2b8ea74155a8f078bc8f29b2..d875bec1463a01e02b035874bad05f797cb8695f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2014-01-30 Russ Tyndall <russ@acceleration.net>
+       * sqlite3-sql.lisp specify :utf-8 as the default encoding if there
+       is not one (allows :clsql-cffi to be closer to working for this
+       backend).
+
+       I ran the test suite successfully once with :clsql-cffi, but there
+       after I got spurious errors and especially unrecoverable errors
+       while connecting about the database being locked
+
 2014-01-30 Russ Tyndall <russ@acceleration.net>
        * sqlite3-sql.lisp, fddl.lisp Dont compare database-identifiers
        with invalid comparison operators

diff --git a/db-sqlite3/sqlite3-sql.lisp b/db-sqlite3/sqlite3-sql.lisp
index 8ce592c6fbe1978f1e0d0ee824b33f4ae9ca05a3..4f953d013212fc5d63d9dd02026745c7bc8ecb8d 100644 (file)
--- a/db-sqlite3/sqlite3-sql.lisp
+++ b/db-sqlite3/sqlite3-sql.lisp
@@ -205,11 +205,13 @@
                                              (sqlite3:sqlite3-column-blob stmt i)
                                              (car types)
                                              :length (sqlite3:sqlite3-column-bytes stmt i)
-                                             :encoding (encoding database))
+                                             :encoding (or (encoding database)
+                                                           :utf-8))
                                             (clsql-uffi:convert-raw-field
                                              (sqlite3:sqlite3-column-text stmt i)
                                              (car types)
-                                             :encoding (encoding database))))))
+                                             :encoding (or (encoding database)
+                                                           :utf-8))))))
                    (when field-names
                      (setf col-names (loop for n from 0 below n-col
                                            collect (sqlite3:sqlite3-column-name stmt n))))