diff demo/more/dbgrid.ur @ 1649:9253765d7724

Rename [Top.id] to avoid clash with [Basis.id]
author Adam Chlipala <adam@chlipala.net>
date Thu, 29 Dec 2011 14:12:03 -0500
parents e2611b5dafce
children 6bc2a8cb3a67
line wrap: on
line diff
--- a/demo/more/dbgrid.ur	Thu Dec 29 10:04:09 2011 -0500
+++ b/demo/more/dbgrid.ur	Thu Dec 29 14:12:03 2011 -0500
@@ -385,19 +385,19 @@
                        val wholeRow = @Folder.concat ! M.keyFolder M.rowFolder
 
                        fun ensql [env] (r : $(M.key ++ M.row)) =
-                           @map2 [rawMeta] [id] [sql_exp env [] []]
+                           @map2 [rawMeta] [ident] [sql_exp env [] []]
                             (fn [t] meta v => @sql_inject meta.Inj v)
                             wholeRow M.raw r
 
                        val new =
-                           row <- @Monad.mapR _ [rawMeta] [id]
+                           row <- @Monad.mapR _ [rawMeta] [ident]
                                    (fn [nm :: Name] [t :: Type] meta => meta.New)
                                    wholeRow M.raw;
                            dml (insert M.tab (ensql row));
                            return row
 
                        fun selector (r : $M.key) : sql_exp [T = M.key ++ M.row] [] [] bool =
-                         @foldR2 [rawMeta] [id]
+                         @foldR2 [rawMeta] [ident]
                           [fn key => rest :: {Type} -> [rest ~ key] => sql_exp [T = key ++ rest] [] [] bool]
                           (fn [nm :: Name] [t :: Type] [key :: {Type}] [[nm] ~ key]
                                            (meta : rawMeta t) (v : t)