diff --git a/hayamiki_lib b/hayamiki_lib index d57036b..d169d60 160000 --- a/hayamiki_lib +++ b/hayamiki_lib @@ -1 +1 @@ -Subproject commit d57036b4baa16371f6eedbf8ff6e4361f4e89081 +Subproject commit d169d6079aaa2b2a29f999b0047feb3d057f84b1 diff --git a/src/generation/vt_view.anubis b/src/generation/vt_view.anubis index bc6a132..3efb58f 100644 --- a/src/generation/vt_view.anubis +++ b/src/generation/vt_view.anubis @@ -44,7 +44,7 @@ define String since col is hk_column(name, col_type, _, help), if col_type is { - p_key then "primary_key", + p_key then "primary_key(\""+to_upper(name)+"\", \""+name+"\")", boolean_field then "boolean(\""+to_upper(name)+"\", \""+name+"\", "+to_Anubis_source(help)+")", date_field(attrs) then "date(\""+to_upper(name)+"\", \""+name+"\", "+to_Anubis_source(help)+")", time_field(attrs) then "time(\""+to_upper(name)+"\", \""+name+"\", "+to_Anubis_source(help)+")", diff --git a/src/web_controller/database/generated/fs_file.anubis b/src/web_controller/database/generated/fs_file.anubis index b4ac980..0ae9806 100644 --- a/src/web_controller/database/generated/fs_file.anubis +++ b/src/web_controller/database/generated/fs_file.anubis @@ -1,8 +1,8 @@ /* * Created by 早見木 (Hayamiki). * Database generator written by フランスのトトロ aka (David RENÉ) - * Date: 2020-04-11 - * Time: 10:13:41 + * Date: 2022-10-23 + * Time: 17:24:03 * */ transmit tools/basis.anubis @@ -135,6 +135,7 @@ public define List(SQLite3_update_field) List(Web_arg) lwa, String __prefix__ )= + (List(SQLite3_update_field)) []+ []+ [field("write_date", bind_Datetime(":v_write_date", db_now))]+ @@ -165,7 +166,7 @@ public define Maybe(Fs_file) row(cursor) then success( fs_file( - db_id((Int)db_integer(cursor)(0)) /* id */, + db_id_or_null(cursor)(0) /* id */, db_datetime(text(cursor)(1)) /* create_date */, db_datetime(text(cursor)(2)) /* write_date */, text(cursor)(3) /* res_model */, @@ -427,9 +428,14 @@ public define Maybe(Int) }, db_id(idx) then if sql_query_timeout(db, - "UPDATE fs_file SET + "INSERT INTO fs_file + (\"id\", \"create_date\", \"write_date\", \"res_model\", \"res_name\", \"file_size\", \"res_id\", \"description\", \"res_field\", \"mimetype\", \"name\", \"url\", \"checksum\", \"datas_fname\", \"path\") + VALUES + (:v_id, :v_create_date, :v_write_date, :v_res_model, :v_res_name, :v_file_size, :v_res_id, :v_description, :v_res_field, :v_mimetype, :v_name, :v_url, :v_checksum, :v_datas_fname, :v_path) + ON CONFLICT( \"id\") DO UPDATE SET \"write_date\" = :v_write_date, \"res_model\" = :v_res_model, \"res_name\" = :v_res_name, \"file_size\" = :v_file_size, \"res_id\" = :v_res_id, \"description\" = :v_description, \"res_field\" = :v_res_field, \"mimetype\" = :v_mimetype, \"name\" = :v_name, \"url\" = :v_url, \"checksum\" = :v_checksum, \"datas_fname\" = :v_datas_fname, \"path\" = :v_path - WHERE id = "+idx+";", + WHERE id = :v_id;", + [bind_Int(":v_id", idx)]+ [ bind_Datetime(":v_write_date", db_now), bind_String_or_NULL(":v_res_model", fs_file.res_model), @@ -458,7 +464,7 @@ public define Maybe(Int) )= if extract_Fs_file_from_web_arg(lwa, "") is { - failure then logError("update_fs_file extract_Fs_file_from_web_arg is failure"); failure, + failure then logError("update_fs_file extract_Fs_file_from_web_arg is failure"); failure, success(fs_file) then update_fs_file(db, fs_file) }. @@ -488,7 +494,17 @@ public define String failure then default_select, success(obj) then obj.name } - }. + } +. + +public define String + get_fs_file_show_string + ( + SQLite3DataBase db, + Fs_file obj + )= + obj.name +. define List((List(CoreAttrs), WebArgValue, String)) _get_selector_fs_file @@ -501,11 +517,7 @@ define List((List(CoreAttrs), WebArgValue, String)) { [] then [selector_default_entry . reverse(so_far)], [ h . t ] then - if h.id is - { - none then [selector_default_entry], - db_id(_id) then _get_selector_fs_file(db, t, [([], wav(to_String(_id)), get_fs_file_show_string(db, h.id)) . so_far]) - } + _get_selector_fs_file(db, t, [([], wav(to_String(h.id)), get_fs_file_show_string(db, h)) . so_far]) }. public define List((List(CoreAttrs), WebArgValue, String)) @@ -552,7 +564,7 @@ define VT_view text("PATH") ]), with model = vt_view_model([ - primary_key, + primary_key("ID", "id"), datetime("CREATE_DATE", "create_date", no_help_text), datetime("WRITE_DATE", "write_date", no_help_text), text("RES_MODEL", "res_model", no_help_text), diff --git a/src/web_controller/hkc_files_management.anubis b/src/web_controller/hkc_files_management.anubis index a77edd7..4528982 100644 --- a/src/web_controller/hkc_files_management.anubis +++ b/src/web_controller/hkc_files_management.anubis @@ -64,7 +64,7 @@ public define (WEB_Session) -> WEB_Controller_Result set_file(db, "hkc", hkc_file_id, filename, "file", filename, "hkc/"+to_fs_folder(hkc_file_id)); ajax(json(http_ok, json_object([json_member("uploaded", json_int(1)), json_member("fileName", json_string(filename)), - json_member("url", json_string("?aws_controller=hk_c&aws_action=download&file="+hkc_file_id))]))) + json_member("url", json_string("?aws_c=hk_c&aws_a=download&file="+hkc_file_id))]))) else println("move_file error from ["+temp_filepath+"] to ["+final_filename+"]"); ajax(json(http_ok, json_object([json_member("uploaded", json_int(0)), diff --git a/src/web_controller/types/generated/fs_file.anubis b/src/web_controller/types/generated/fs_file.anubis index 7e17df0..259537d 100644 --- a/src/web_controller/types/generated/fs_file.anubis +++ b/src/web_controller/types/generated/fs_file.anubis @@ -1,8 +1,8 @@ /* * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) - * Date: 2020-04-11 - * Time: 10:14:04 + * Date: 2022-10-05 + * Time: 23:24:45 * */ diff --git a/xlib b/xlib index 18c01f9..5b6fb40 160000 --- a/xlib +++ b/xlib @@ -1 +1 @@ -Subproject commit 18c01f914e2129eb9289c945d180fb45bc53b0d8 +Subproject commit 5b6fb40914b98ea594417dcdf319d98abd19a0b4 -- libgit2 0.21.4