add a prefix (type name) to extract_from_web_arg function generation due to collision issues

Julien Verneuil
1 parent dab0bd7f
Showing 2 changed files with 14 additions and 14 deletions Show diff stats
src/generation/fields.anubis
src/generation/types.anubis
@@ -83,16 +83,16 @@ public define String
   if t is 
   {
     //anubis(_T)                          then "constant_byte_array(0,0)", 
-    p_key                             then "with "+name+" = get_DB_id(lwa, \""+name+"\"),",
+    p_key                             then "with "+name+" = get_DB_id(lwa, __prefix__+\""+name+"\"),",
     //binary                              then "constant_byte_array(0,0)",
-    boolean_field                     then "with "+name+" = get_Bool(lwa, \""+name+"\"),",
-    date_field(attrs)                 then if attrs = none then "get_DB_date(lwa, \""+name+"\")" else "with "+name+" = get_dummy_DB_date,",
-    time_field(attrs)                 then if attrs = none then "get_DB_time(lwa, \""+name+"\")" else "with "+name+" = get_dummy_DB_time,",
-    datetime_field(attrs)             then if attrs = none then "get_DB_datetime(lwa, \""+name+"\")" else "with "+name+" = get_dummy_DB_datetime,",      
-    foreign_key(_,_)                  then "get_Int(lwa, \""+name+"\")",
-    integer_field                     then "get_Int(lwa, \""+name+"\")",
-    char_field(_,_)                   then "get_String(lwa, \""+name+"\")",
-    text_field                        then "get_String(lwa, \""+name+"\")"
+    boolean_field                     then "with "+name+" = get_Bool(lwa, __prefix__+\""+name+"\"),",
+    date_field(attrs)                 then if attrs = none then "get_DB_date(lwa, __prefix__+\""+name+"\")" else "with "+name+" = get_dummy_DB_date,",
+    time_field(attrs)                 then if attrs = none then "get_DB_time(lwa, __prefix__+\""+name+"\")" else "with "+name+" = get_dummy_DB_time,",
+    datetime_field(attrs)             then if attrs = none then "get_DB_datetime(lwa, __prefix__+\""+name+"\")" else "with "+name+" = get_dummy_DB_datetime,",      
+    foreign_key(_,_)                  then "get_Int(lwa, __prefix__+\""+name+"\")",
+    integer_field                     then "get_Int(lwa, __prefix__+\""+name+"\")",
+    char_field(_,_)                   then "get_String(lwa, __prefix__+\""+name+"\")",
+    text_field                        then "get_String(lwa, __prefix__+\""+name+"\")"
   }.
 public define String
@@ -123,8 +123,8 @@ public define Maybe(One)
   since _generate_extract_web_arg(columns, [], 0) is ((List(String))list_of_web_arg, (Int) nb_closure),
   //generate the type of the table that contain all components 
   if write_string(stream, 
-     "\n\ndefine Maybe("+type_name+")\n"+
-     "  extract_from_web_arg\n"+
+     "\n\npublic define Maybe("+type_name+")\n"+
+     "  extract_"+type_name+"_from_web_arg\n"+
      "  (\n"+
      "    List(Web_arg) lwa,\n"+
      "    String __prefix__\n"+
@@ -134,7 +134,7 @@ public define Maybe(One)
      "  "+fill(nb_closure, '}')+          //add close } according to number of web arg 
      ".\n") is                                         //end of the function
   {
-    failure     then  println("can't write extract_from_web_arg "+type_name); failure,
+    failure     then  println("can't write extract_"+type_name+"_from_web_arg "+type_name); failure,
     success(_)  then  success(unique)
   }.
@@ -298,9 +298,9 @@ public define Maybe(One)
      "    SQLite3DataBase db,\n"+
      "    List(Web_arg)   lwa\n"+
      "  )=\n"+
-     "  if extract_from_web_arg(lwa, \"\") is\n"+
+     "  if extract_"+type_name+"_from_web_arg(lwa, \"\") is\n"+
      "  {\n"+
-     "    failure         then logError(debug_log, \"update_"+name+" extract_from_web_arg is failure\"); failure,\n"+
+     "    failure         then logError(debug_log, \"update_"+name+" extract_"+type_name+"_from_web_arg is failure\"); failure,\n"+
      "    success("+name+")  then success(update_"+name+"(db, "+name+"))\n"+
      "  }.\n\n"