r10275: 22 Jan 2005 Kevin Rosenberg <kevin@rosenberg.net>

        * db-sqlite/sqlite-sql.lisp, db-sqlite3/sqlite3-sql.lisp:
        Better support for 64 bit environments

diff --git a/ChangeLog b/ChangeLog
index 4692d3ac2dbc7cdbe86c35c3faea02ca21dfeff2..bb68fc816b273cd60568cc4dc7a8e47dcc7e4ded 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+22 Jan 2005 Kevin Rosenberg <kevin@rosenberg.net>
+       * db-sqlite/sqlite-sql.lisp, db-sqlite3/sqlite3-sql.lisp:
+       Better support for 64 bit environments
+
 05 Jan 2005 Kevin Rosenberg <kevin@rosenberg.net>
        * Version 3.1.5
        * sql/metaclass.lisp: Make t the default value of :set

diff --git a/db-sqlite/sqlite-sql.lisp b/db-sqlite/sqlite-sql.lisp
index 689202ac9184b9169378c0e2846216ccb4160dc3..be6ff906ac54ea7728dc810123da3cbd6542afd3 100644 (file)
--- a/db-sqlite/sqlite-sql.lisp
+++ b/db-sqlite/sqlite-sql.lisp
@@ -174,8 +174,9 @@
       (loop for type in raw-types
            collect
            (case type
-             ((:int :integer :tinyint :long)
+             ((:int :integer :tinyint)
               :int32)
+             (:long #+(or x86-64 64bit) :int64 #-(or x86-64 64bit) :int32)
              (:bigint
               :int64)
              ((:float :double)

diff --git a/db-sqlite3/sqlite3-sql.lisp b/db-sqlite3/sqlite3-sql.lisp
index 0d6bf70e0432eb24c3a344062c7ecc5530760d86..8950686f4fee2400bb22ae475e5f61dbfcc0eecf 100644 (file)
--- a/db-sqlite3/sqlite3-sql.lisp
+++ b/db-sqlite3/sqlite3-sql.lisp
@@ -103,7 +103,8 @@
                        (t :string))))
       (loop for type in result-types
            collect (case type
-                     ((:int :integer :tinyint :long) :int32)
+                     ((:int :integer :tinyint) :int32)
+                     (:long #+(or x86-64 64bit) :int64 #-(or x86-64 64bit) :int32)
                      (:bigint :int64)
                      ((:float :double) :double)
                      ((:numeric) :number)