--- a/sql.ur	Thu Dec 29 10:10:50 2011 -0500
+++ b/sql.ur	Thu Dec 29 14:15:02 2011 -0500
@@ -1,11 +1,11 @@
 fun sqexps [env] [fields] (fl : folder fields) (inj : $(map sql_injectable fields)) (r : $fields) =
-    @map2 [sql_injectable] [id] [sql_exp env [] []]
+    @map2 [sql_injectable] [ident] [sql_exp env [] []]
      (fn [t] => @sql_inject)
      fl inj r
 
 fun selector [tn :: Name] [fs] [ofs] [fs ~ ofs] (fl : folder fs) (m : $(map sql_injectable fs)) (r : $fs)
     : sql_exp [tn = ofs ++ fs] [] [] bool =
-    @foldR2 [sql_injectable] [id]
+    @foldR2 [sql_injectable] [ident]
      [fn key => rest :: {Type} -> [rest ~ key] => sql_exp [tn = key ++ rest] [] [] bool]
      (fn [nm :: Name] [t :: Type] [key :: {Type}] [[nm] ~ key]
                       (inj : sql_injectable t) (v : t)