diff --git a/calexium_lib b/calexium_lib index 3306145..605449b 160000 --- a/calexium_lib +++ b/calexium_lib @@ -1 +1 @@ -Subproject commit 3306145430afb6abfdae08e324b4002833eacd7e +Subproject commit 605449b023dcef3ea0b7261c1d7d120e000d006e diff --git a/hayamiki_lib b/hayamiki_lib index ea1efe8..7c694bd 160000 --- a/hayamiki_lib +++ b/hayamiki_lib @@ -1 +1 @@ -Subproject commit ea1efe8b2abb5813464c7399d767aee6c0545475 +Subproject commit 7c694bdb28d105b490596e5a7c186da619654bbb diff --git a/src/generation/types.anubis b/src/generation/types.anubis index b9a959c..d99a70f 100644 --- a/src/generation/types.anubis +++ b/src/generation/types.anubis @@ -154,19 +154,19 @@ public define Maybe(One) " failure then reverse(so_far),\n"+ " success(data) then _get_all_"+name+"(table_cursor, [data . so_far])\n"+ " }.\n"+ - "\n\n"+ - //SQL query - "public define List("+type_name+")\n"+ - " get_all_"+name+"\n"+ - " (\n"+ - " SQLite3DataBase db,\n"+ - " )=\n"+ - " if sql_query_timeout(db, \"SELECT "+join(", ", enclose("\\\"",to_List_String(columns, true)))+" FROM "+name+";\", [], \"get_all_"+name+"\") is\n"+ - " {\n"+ - " error(_) then [],\n"+ - " ok(_, cursor, _) then _get_all_"+name+"(cursor, [])\n"+ - " }.\n"+ "\n\n" + //SQL query +// "public define List("+type_name+")\n"+ +// " get_all_"+name+"\n"+ +// " (\n"+ +// " SQLite3DataBase db,\n"+ +// " )=\n"+ +// " if sql_query_timeout(db, \"SELECT "+join(", ", enclose("\\\"",to_List_String(columns, true)))+" FROM "+name+";\", [], \"get_all_"+name+"\") is\n"+ +// " {\n"+ +// " error(_) then [],\n"+ +// " ok(_, cursor, _) then _get_all_"+name+"(cursor, [])\n"+ +// " }.\n"+ +// "\n\n" ) is //end of the function { failure then println("can't write generate_get_all "+type_name); failure, @@ -192,7 +192,12 @@ public define Maybe(One) " SQLite3DataBase db,\n"+ " String clause\n"+ " )=\n"+ - " if sql_query_timeout(db, \"SELECT "+join(", ", enclose("\\\"",to_List_String(columns, true)))+" FROM "+name+" WHERE \"+clause+\";\", [], \"get_all_"+name+"_by_clause\") is\n"+ + " with final_clause = if clause = \"\" then\n"+ + " \"\"\n"+ + " else\n"+ + " \"WHERE \"+clause,\n"+ + "\n"+ + " if sql_query_timeout(db, \"SELECT "+join(", ", enclose("\\\"",to_List_String(columns, true)))+" FROM "+name+" \"+final_clause+\";\", [], \"get_all_"+name+"_by_clause\") is\n"+ " {\n"+ " error(_) then [],\n"+ " ok(_, cursor, _) then _get_all_"+name+"(cursor, [])\n"+ @@ -451,8 +456,9 @@ public define Maybe(One) " get_selector_"+name+"\n"+ " (\n"+ " SQLite3DataBase db,\n"+ + " String clause\n"+ " )=\n"+ - " _get_selector_"+name+"(db, get_all_"+name+"(db), [])." + " _get_selector_"+name+"(db, get_all_"+name+"_by_clause(db, clause), [])." ) is //end of the function { failure then println("can't write generate_show_string "+type_name); failure, @@ -513,9 +519,10 @@ public define Maybe(One) "public define VT_view\n"+ " get_viewable_"+table_name+"_"+view_name+"\n"+ " (\n"+ - " SQLite3DataBase db\n"+ + " SQLite3DataBase db,\n"+ + " String clause\n"+ " )=\n"+ - " _get_viewable_"+table_name+"_"+view_name+"(db, get_all_"+table_name+"(db), []).\n\n" + " _get_viewable_"+table_name+"_"+view_name+"(db, get_all_"+table_name+"_by_clause(db, clause), []).\n\n" ) is //end of the function { failure then println("can't write generate_VT_view "+type_name); failure, @@ -575,7 +582,7 @@ public define String [] then so_far + "\n"+ - " _get_viewable_"+table_name+"_default(db, get_all_"+table_name+"(db), [])\n", + " _get_viewable_"+table_name+"_default(db, get_all_"+table_name+"_by_clause(db, clause), [])\n", [view . t] then with view_name = if view is { @@ -585,7 +592,7 @@ public define String _generate_get_viewable_if_else( table_name, t, so_far + " if view = \""+view_name+"\" then\n"+ - " _get_viewable_"+table_name+"_"+view_name+"(db, get_all_"+table_name+"(db), [])\n"+ + " _get_viewable_"+table_name+"_"+view_name+"(db, get_all_"+table_name+"_by_clause(db, clause), [])\n"+ " else" ) }. @@ -606,7 +613,8 @@ public define Maybe(One) " get_viewable_"+table_name+"\n"+ " (\n"+ " SQLite3DataBase db,\n"+ - " String view\n"+ + " String view,\n"+ + " String clause\n"+ " )=\n"+ _generate_get_viewable_if_else(table_name, list_view, "")+ ".\n" diff --git a/src/generation/vt_edit.anubis b/src/generation/vt_edit.anubis index 2150e1d..fab8b3e 100644 --- a/src/generation/vt_edit.anubis +++ b/src/generation/vt_edit.anubis @@ -23,8 +23,8 @@ define String join(",\n", map((HK_FK_View fk_view) |-> - since fk_view is fk_view(app_name, table_name, fk_col), - indent+"hk_v_edit_tab(String fk_table_name, "+fk_col+", \"default\")" + since fk_view is fk_view(app_name, fk_table_name, fk_col), + indent+" hk_v_edit_tab(\""+fk_table_name+"\", \""+fk_col+"\", \"default\")" , fk_views) ) @@ -47,16 +47,16 @@ public define Maybe(One) with type_name = to_upper(table_name, 1), //make the first character to upper case and be an Anubis Type. with view_name = if edit_view is { - edit_view_all then "default", - edit_view(view_name, _, _) then view_name + edit_view_all then "default", + edit_view(v_name, _, _) then v_name }, with current_edit_view = if edit_view is { edit_view_all then columns, - edit_view(view_name, cols, _) then + edit_view(v_name, cols, _) then if get_HK_Model_Column_list_from_name_list(columns, cols) is { - failure then println("generate_VT_edit: can't get all specified columns for table \""+table_name+"\" view name \""+view_name+"\" cols["+join(", ",cols)+"]");[], + failure then println("generate_VT_edit: can't get all specified columns for table \""+table_name+"\" view name \""+v_name+"\" cols["+join(", ",cols)+"]");[], success(got_columns) then got_columns, } }, -- libgit2 0.21.4