From 98b889b93a2ab366f002bc0607063e56bb3e6339 Mon Sep 17 00:00:00 2001 From: Adam Chlipala Date: Sat, 12 Sep 2009 15:08:16 -0400 Subject: Nullable columns *might* be working, but too much JS is generated for the page to load in finite time --- demo/more/grid1.ur | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'demo/more/grid1.ur') diff --git a/demo/more/grid1.ur b/demo/more/grid1.ur index a62d7819..4d0fe1bf 100644 --- a/demo/more/grid1.ur +++ b/demo/more/grid1.ur @@ -4,11 +4,11 @@ table t1 : {Id : int, A : string} PRIMARY KEY Id sequence s -table t : {Id : int, A : int, B : string, C : bool, D : int} +table t : {Id : int, A : int, B : string, C : bool, D : int, E : option int} PRIMARY KEY Id, CONSTRAINT Foreign FOREIGN KEY (D) REFERENCES t1(Id) ON DELETE CASCADE -fun page (n, s) = return A = {[n]}, B = {[s]} +(*fun page (n, s) = return A = {[n]}, B = {[s]}*) open Make(struct val tab = t @@ -23,6 +23,8 @@ open Make(struct C = {New = return False, Inj = _}, D = {New = return 0, + Inj = _}, + E = {New = return None, Inj = _}} structure F = Direct.Foreign(struct @@ -34,10 +36,11 @@ open Make(struct val cols = {Id = Direct.readOnly [#Id] ! "Id" Direct.int, A = Direct.editable [#A] ! "A" Direct.int, B = Direct.editable [#B] ! "B" Direct.string, - C = Direct.editable [#C] ! "C" Direct.bool, + C = Direct.editable [#C] ! "C" Direct.bool(*, D = Direct.editable [#D] ! "D" F.meta, + E = Direct.editable [#E] ! "E" (Direct.nullable Direct.int), DA = computed "2A" (fn r => 2 * r.A), - Link = computedHtml "Link" (fn r => Go)} + Link = computedHtml "Link" (fn r => Go)*)} end) fun main () = -- cgit v1.2.3