From ad533918066481c633c2afbe84b3b5fbc3de8610 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Fri, 10 Oct 2008 20:52:28 -0500
Subject: [PATCH] make all types singletons instead of symbols, add NULL
support for select statements
---
basis/db/queries/queries.factor | 3 +++
basis/db/tuples/tuples-tests.factor | 7 ++++++-
basis/db/types/types.factor | 2 +-
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/basis/db/queries/queries.factor b/basis/db/queries/queries.factor
index 768ec70185..3cf4d98215 100644
--- a/basis/db/queries/queries.factor
+++ b/basis/db/queries/queries.factor
@@ -114,6 +114,9 @@ M: sequence where ( spec obj -- )
[ " or " 0% ] [ dupd where ] interleave drop
] in-parens ;
+M: NULL where ( spec obj -- )
+ drop column-name>> 0% " is NULL" 0% ;
+
: object-where ( spec obj -- )
over column-name>> 0% " = " 0% bind# ;
diff --git a/basis/db/tuples/tuples-tests.factor b/basis/db/tuples/tuples-tests.factor
index f5569a97cd..192986484e 100644
--- a/basis/db/tuples/tuples-tests.factor
+++ b/basis/db/tuples/tuples-tests.factor
@@ -472,7 +472,12 @@ TUPLE: exam id name score ;
T{ exam } select-tuples
] unit-test
- [ 4 ] [ T{ exam } count-tuples ] unit-test ;
+ [ 4 ] [ T{ exam } count-tuples ] unit-test
+
+ [ ] [ T{ exam { score 10 } } insert-tuple ] unit-test
+
+ [ 10 ]
+ [ T{ exam { name NULL } } select-tuples first score>> ] unit-test ;
TUPLE: bignum-test id m n o ;
: <bignum-test> ( m n o -- obj )
diff --git a/basis/db/types/types.factor b/basis/db/types/types.factor
index ad9c9b0acf..6a889689ce 100644
--- a/basis/db/types/types.factor
+++ b/basis/db/types/types.factor
@@ -91,7 +91,7 @@ ERROR: not-persistent class ;
: relation? ( spec -- ? ) [ +has-many+ = ] deep-find ;
-SYMBOLS: INTEGER BIG-INTEGER SIGNED-BIG-INTEGER UNSIGNED-BIG-INTEGER
+SINGLETONS: INTEGER BIG-INTEGER SIGNED-BIG-INTEGER UNSIGNED-BIG-INTEGER
DOUBLE REAL BOOLEAN TEXT VARCHAR DATE TIME DATETIME TIMESTAMP BLOB
FACTOR-BLOB NULL URL ;