From 8bc8f772e1db41ce378c4f43eed6f9d7073c0d45 Mon Sep 17 00:00:00 2001 From: totoro Date: Thu, 19 Jan 2017 10:59:31 +0100 Subject: [PATCH] remove the "indexed" attribute which is not compatible with SQlite3 --- hayamiki.aproj | 734 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- hayamiki.ide | 18 ------------------ hayamiki_generator.aproj | 734 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ hayamiki_generator.ide | 22 ++++++++++++++++++++++ hayamiki_lib | 2 +- src/generation/model.anubis | 1 - src/model.3.0.0.anubis | 32 ++++++++++++++++---------------- 7 files changed, 773 insertions(+), 770 deletions(-) delete mode 100644 hayamiki.aproj delete mode 100644 hayamiki.ide create mode 100644 hayamiki_generator.aproj create mode 100644 hayamiki_generator.ide diff --git a/hayamiki.aproj b/hayamiki.aproj deleted file mode 100644 index c812e23..0000000 --- a/hayamiki.aproj +++ /dev/null @@ -1,734 +0,0 @@ - - - {89372B21-80FA-4EB8-B17C-072EB55713D6} - Debug - AnyCPU - Exe - model_manager - hayamiki - src\main.anubis - ./%3b./src - False - False - False - - - bin\Debug\ - True - Full - False - -sc - - - bin\Release\ - False - None - True - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/hayamiki.ide b/hayamiki.ide deleted file mode 100644 index ab1b6eb..0000000 --- a/hayamiki.ide +++ /dev/null @@ -1,18 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 -# SharpDevelop 1.0.12.108 -Project("{B6712916-30DE-4a3e-A54C-2A79AC984AEE}") = "hayamiki", "hayamiki.aproj", "{89372B21-80FA-4EB8-B17C-072EB55713D6}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {89372B21-80FA-4EB8-B17C-072EB55713D6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {89372B21-80FA-4EB8-B17C-072EB55713D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {89372B21-80FA-4EB8-B17C-072EB55713D6}.Release|Any CPU.Build.0 = Release|Any CPU - {89372B21-80FA-4EB8-B17C-072EB55713D6}.Release|Any CPU.ActiveCfg = Release|Any CPU - EndGlobalSection -EndGlobal diff --git a/hayamiki_generator.aproj b/hayamiki_generator.aproj new file mode 100644 index 0000000..c812e23 --- /dev/null +++ b/hayamiki_generator.aproj @@ -0,0 +1,734 @@ + + + {89372B21-80FA-4EB8-B17C-072EB55713D6} + Debug + AnyCPU + Exe + model_manager + hayamiki + src\main.anubis + ./%3b./src + False + False + False + + + bin\Debug\ + True + Full + False + -sc + + + bin\Release\ + False + None + True + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/hayamiki_generator.ide b/hayamiki_generator.ide new file mode 100644 index 0000000..fb597a4 --- /dev/null +++ b/hayamiki_generator.ide @@ -0,0 +1,22 @@ + +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +# SharpDevelop 1.0.12.108 +Project("{B6712916-30DE-4a3e-A54C-2A79AC984AEE}") = "hayamiki_generator", "hayamiki_generator.aproj", "7E37A20A-56EA-4128-88F5-FE55B0F5CB45" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {89372B21-80FA-4EB8-B17C-072EB55713D6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {89372B21-80FA-4EB8-B17C-072EB55713D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {89372B21-80FA-4EB8-B17C-072EB55713D6}.Release|Any CPU.Build.0 = Release|Any CPU + {89372B21-80FA-4EB8-B17C-072EB55713D6}.Release|Any CPU.ActiveCfg = Release|Any CPU + 7E37A20A-56EA-4128-88F5-FE55B0F5CB45.Debug|Any CPU.Build.0 = Debug|Any CPU + 7E37A20A-56EA-4128-88F5-FE55B0F5CB45.Debug|Any CPU.ActiveCfg = Debug|Any CPU + 7E37A20A-56EA-4128-88F5-FE55B0F5CB45.Release|Any CPU.Build.0 = Release|Any CPU + 7E37A20A-56EA-4128-88F5-FE55B0F5CB45.Release|Any CPU.ActiveCfg = Release|Any CPU + EndGlobalSection +EndGlobal diff --git a/hayamiki_lib b/hayamiki_lib index f6c73ca..27f3d0f 160000 --- a/hayamiki_lib +++ b/hayamiki_lib @@ -1 +1 @@ -Subproject commit f6c73ca7279c2073d848468064774426eda32441 +Subproject commit 27f3d0f6b93aa27fbbd34993a72cef1fb36b347f diff --git a/src/generation/model.anubis b/src/generation/model.anubis index db739d6..71cdbfe 100644 --- a/src/generation/model.anubis +++ b/src/generation/model.anubis @@ -19,7 +19,6 @@ public define String if attr is { unique then "UNIQUE", - indexed then "INDEXED", // by default, a column is not indexed default(str) then "DEFAULT "+str, // default value (used in case of creation of a NON NULL column // in a table which already contains some rows) not_null then "NOT NULL" diff --git a/src/model.3.0.0.anubis b/src/model.3.0.0.anubis index cf7119b..0edb70b 100644 --- a/src/model.3.0.0.anubis +++ b/src/model.3.0.0.anubis @@ -87,8 +87,8 @@ public define HK_Table production_mass_storage_table = hk_model( [ - hk_column("purchase_id", foreign_key("purchase"), [indexed]), - hk_column("model_id", foreign_key("mass_storage_model"), [indexed]), + hk_column("purchase_id", foreign_key("purchase"), []), + hk_column("model_id", foreign_key("mass_storage_model"), []), hk_column("serial", char_field(40), []), // hk_column("status", char_field(10), []), // hk_column("date_created", datetime_field(auto_now_add), []), @@ -127,7 +127,7 @@ public define HK_Table production_mass_storage_model_table = [ hk_column("manufacturer", char_field(20), []), - hk_column("type_id", foreign_key("mass_storage_type"), [indexed]), + hk_column("type_id", foreign_key("mass_storage_type"), []), hk_column("capacity", integer_field, []), // hk_column("tr_min", integer_field, []), // hk_column("date_created", datetime_field(auto_now_add), []), @@ -151,8 +151,8 @@ public define HK_Table production_memory_table = hk_model( [ - hk_column("purchase_id", foreign_key("purchase"), [indexed]), - hk_column("model_id", foreign_key("memory_model"), [indexed]), + hk_column("purchase_id", foreign_key("purchase"), []), + hk_column("model_id", foreign_key("memory_model"), []), hk_column("serial", char_field(40), []), // hk_column("status", char_field(10), []), // hk_column("date_created", datetime_field(auto_now_add), []), @@ -176,7 +176,7 @@ public define HK_Table production_memory_model_table = hk_model( [ - hk_column("type_id", foreign_key("memory_type"), [indexed]), + hk_column("type_id", foreign_key("memory_type"), []), hk_column("manufacturer", char_field(20), []), // hk_column("capacity", integer_field, []) // ], @@ -212,8 +212,8 @@ public define HK_Table production_motherboard_table = hk_model( [ - hk_column("purchase_id", foreign_key("purchase"), [indexed]), - hk_column("model_id", foreign_key("motherboard_model"), [indexed]), + hk_column("purchase_id", foreign_key("purchase"), []), + hk_column("model_id", foreign_key("motherboard_model"), []), hk_column("serial", char_field(40), []), // hk_column("week_fab", char_field(10), []), // hk_column("status", char_field(10), []), // @@ -264,8 +264,8 @@ public define HK_Table production_power_supply_table = hk_model( [ - hk_column("purchase_id", foreign_key("purchase"), [indexed]), - hk_column("model_id", foreign_key("power_supply_model"), [indexed]), + hk_column("purchase_id", foreign_key("purchase"), []), + hk_column("model_id", foreign_key("power_supply_model"), []), hk_column("serial", char_field(40), []), // hk_column("status", char_field(10), []), // hk_column("date_created", datetime_field(auto_now_add), []), @@ -310,7 +310,7 @@ public define HK_Table production_product_reference_table = hk_model( [ - hk_column("type_ref_id", foreign_key("type_number"), [indexed]), + hk_column("type_ref_id", foreign_key("type_number"), []), hk_column("product_ref", char_field(4), []), hk_column("product_name", char_field(30), []), // hk_column("description", char_field(200), []), // @@ -436,8 +436,8 @@ public define HK_Table production_purchase_table = hk_model( [ hk_column("date", date_field(none), []), - hk_column("buyer_id", foreign_key(app_name("staff"),"staff"), [indexed]), - hk_column("supplier_id", foreign_key("supplier"), [indexed]), + hk_column("buyer_id", foreign_key(app_name("staff"),"staff"), []), + hk_column("supplier_id", foreign_key("supplier"), []), hk_column("order_ref", char_field(50), []), // hk_column("description", char_field(200), []), // description of the purchase hk_column("date_created", datetime_field(auto_now_add), []), @@ -585,9 +585,9 @@ public define HK_Table staff_table = hk_model( [ - hk_column("contact_id", foreign_key(none, "address_book_contact"), [indexed]), - hk_column("department_id", foreign_key("department"), [indexed]), - hk_column("role_id", foreign_key("role"), [indexed]), + hk_column("contact_id", foreign_key(none, "address_book_contact"), []), + hk_column("department_id", foreign_key("department"), []), + hk_column("role_id", foreign_key("role"), []), hk_column("email", char_field(75), []), hk_column("incoming_date", date_field(none), []), // hk_column("outgoing_date", date_field(none), [], help_text("if not still present in company. The date of official outgoing")), // -- libgit2 0.21.4