Changeset 36672 in project

Timestamp:

09/30/18 17:28:57 (2 years ago)

Author:

Thomas Chust

Message:

[sqlite3] Proper support for integers in the 64-bit range (thanks to wasamasa)

Location:

release/5/sqlite3/trunk

Files:

• sqlite3.egg (modified) (1 diff)
• sqlite3.html (modified) (1 diff)
• sqlite3.scm (modified) (3 diffs)
• tests/run.scm (modified) (1 diff)

release/5/sqlite3/trunk/sqlite3.egg

@@ -3 +3 @@
  (author "Thomas Chust")
  (license "BSD")
- (version "3.7.1")
+ (version "3.7.2")
  (dependencies
    srfi-1 srfi-13 srfi-18 srfi-69 object-evict

release/5/sqlite3/trunk/sqlite3.html

@@ -370 +370 @@
 <td><tt>integer: #t = 1, #f = 0</tt></td></tr>
 <tr>
-<td><tt>fixnum?</tt></td>
+<td><tt>exact-integer?</tt></td>
 <td><tt>integer</tt></td></tr>
 <tr>

release/5/sqlite3/trunk/sqlite3.scm

@@ -433 +433 @@
           "sqlite3_result_blob(ctx, v, n, SQLITE_TRANSIENT);")
         ctx v (blob-size v))]
-    [(or (and (fixnum? v) v) (and (boolean? v) (if v 1 0)))
-      => (lambda (v)
-          ((foreign-lambda void "sqlite3_result_int" sqlite3:context int)
-            ctx v))]
+    [(boolean? v)
+      ((foreign-lambda void "sqlite3_result_int" sqlite3:context bool)
+        ctx v)]
+    [(exact-integer? v)
+      ((foreign-lambda void "sqlite3_result_int64" sqlite3:context integer64)
+        ctx v)]
     [(real? v)
       ((foreign-lambda void "sqlite3_result_double" sqlite3:context double)
@@ -764 +766 @@
               stmt (fx+ i 1) v (blob-size v))
         => (abort-sqlite3-error 'bind! (statement-database stmt) stmt i v)])]
-    [(or (and (fixnum? v) v) (and (boolean? v) (if v 1 0)))
-      => (lambda (v)
-          (cond [((foreign-lambda sqlite3:status "sqlite3_bind_int"
-                    sqlite3:statement int int)
-                  stmt (fx+ i 1) v)
-            => (abort-sqlite3-error 'bind! (statement-database stmt) stmt i v)]))]
+    [(boolean? v)
+      (cond [((foreign-lambda sqlite3:status "sqlite3_bind_int"
+                sqlite3:statement int bool)
+              stmt (fx+ i 1) v)
+        => (abort-sqlite3-error 'bind! (statement-database stmt) stmt i v)])]
+    [(exact-integer? v)
+      (cond [((foreign-lambda sqlite3:status "sqlite3_bind_int64"
+                sqlite3:statement int integer64)
+              stmt (fx+ i 1) v)
+        => (abort-sqlite3-error 'bind! (statement-database stmt) stmt i v)])]
     [(real? v)
       (cond [((foreign-lambda sqlite3:status "sqlite3_bind_double"
@@ -870 +876 @@
             (string-contains-ci type "bool"))
         ((foreign-lambda bool "sqlite3_column_int" sqlite3:statement int) stmt i)
-        ((foreign-lambda integer "sqlite3_column_double" sqlite3:statement int) stmt i))]
+        ((foreign-lambda integer64 "sqlite3_column_int64" sqlite3:statement int) stmt i))]
     [(float)
       ((foreign-lambda double "sqlite3_column_double" sqlite3:statement int) stmt i)]

release/5/sqlite3/trunk/tests/run.scm

@@ -169 +169 @@
           db "SELECT id, data FROM Foo;")))
 
+    (test "inserting fixnums and bignums"
+      '(10000000 10000000000)
+      (with-database [db ":memory:"]
+        (execute db "CREATE TABLE Foo (id INTEGER PRIMARY KEY, data INTEGER);")
+        (update db "INSERT INTO Foo (data) VALUES (?);" 10000000) ; fixnum
+        (update db "INSERT INTO Foo (data) VALUES (?);" 10000000000) ; bignum
+        (map-row identity db "SELECT data FROM Foo;")))
+
     (test "parameter count"
       3