From e1c0d2808a1fba745198c9354f780ab63b1022e0 Mon Sep 17 00:00:00 2001 From: bergmann Date: Sun, 5 May 2019 14:48:16 +0200 Subject: [PATCH] * shortened identifier names in mariadb driver --- .../driver/mariadb/schema/schema.cpp | 2 +- .../driver/mariadb/schema/table.cpp | 12 ++++---- test/cpphibernate_init.cpp | 28 +++++++++---------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/cpphibernate/driver/mariadb/schema/schema.cpp b/src/cpphibernate/driver/mariadb/schema/schema.cpp index 41ce605..4c321c6 100644 --- a/src/cpphibernate/driver/mariadb/schema/schema.cpp +++ b/src/cpphibernate/driver/mariadb/schema/schema.cpp @@ -256,4 +256,4 @@ void schema_t::init(const init_context& context) const } } -#undef exec_query \ No newline at end of file +#undef exec_query diff --git a/src/cpphibernate/driver/mariadb/schema/table.cpp b/src/cpphibernate/driver/mariadb/schema/table.cpp index baae21e..7b0cf28 100644 --- a/src/cpphibernate/driver/mariadb/schema/table.cpp +++ b/src/cpphibernate/driver/mariadb/schema/table.cpp @@ -871,7 +871,7 @@ std::string build_init_stage2_query(const table_t& table) os << indent << "ADD CONSTRAINT `fk_" << table.table_name - << "_to_" + << "_" << ref_key_info.field_name << "`" << incindent @@ -908,9 +908,9 @@ std::string build_init_stage2_query(const table_t& table) os << indent << "ADD CONSTRAINT `fk_" << table.table_name - << "_to_" + << "_" << ref_key_info.table_name - << "_id_" + << "_" << field_info.field_name << "`" << incindent @@ -950,9 +950,9 @@ std::string build_init_stage2_query(const table_t& table) os << indent << "ADD CONSTRAINT `fk_" << table.table_name - << "_to_" + << "_" << field_info.table_name - << "_id_" + << "_" << field_info.field_name << "`" << incindent @@ -1824,4 +1824,4 @@ void table_t::destroy_cleanup(const base_context& context, table_set& processed, ptr->destroy_cleanup(context, processed, true, false); } } -} \ No newline at end of file +} diff --git a/test/cpphibernate_init.cpp b/test/cpphibernate_init.cpp index f81a4b5..72c88a0 100644 --- a/test/cpphibernate_init.cpp +++ b/test/cpphibernate_init.cpp @@ -209,79 +209,79 @@ TEST(CppHibernateTests, init) "DEFAULT CHARACTER SET = utf8"); expect_query(mock, "ALTER TABLE `tbl_test3`\n" - " ADD CONSTRAINT `fk_tbl_test3_to_tbl_derived3_id_test3_list`\n" + " ADD CONSTRAINT `fk_tbl_test3_tbl_derived3_test3_list`\n" " FOREIGN KEY IF NOT EXISTS (`tbl_derived3_id_test3_list`)\n" " REFERENCES `test`.`tbl_derived3` (`tbl_derived3_id`)\n" " ON DELETE SET NULL\n" " ON UPDATE NO ACTION,\n" - " ADD CONSTRAINT `fk_tbl_test3_to_tbl_derived3_id_test3_vector`\n" + " ADD CONSTRAINT `fk_tbl_test3_tbl_derived3_test3_vector`\n" " FOREIGN KEY IF NOT EXISTS (`tbl_derived3_id_test3_vector`)\n" " REFERENCES `test`.`tbl_derived3` (`tbl_derived3_id`)\n" " ON DELETE SET NULL\n" " ON UPDATE NO ACTION"); expect_query(mock, "ALTER TABLE `tbl_derived1`\n" - " ADD CONSTRAINT `fk_tbl_derived1_to_tbl_base_id`\n" + " ADD CONSTRAINT `fk_tbl_derived1_tbl_base_id`\n" " FOREIGN KEY IF NOT EXISTS (`tbl_base_id`)\n" " REFERENCES `test`.`tbl_base` (`tbl_base_id`)\n" " ON DELETE CASCADE\n" " ON UPDATE CASCADE,\n" - " ADD CONSTRAINT `fk_tbl_derived1_to_tbl_test1_id_test1_data`\n" + " ADD CONSTRAINT `fk_tbl_derived1_tbl_test1_test1_data`\n" " FOREIGN KEY IF NOT EXISTS (`tbl_test1_id_test1_data`)\n" " REFERENCES `test`.`tbl_test1` (`tbl_test1_id`)\n" " ON DELETE CASCADE\n" " ON UPDATE NO ACTION"); expect_query(mock, "ALTER TABLE `tbl_derived2`\n" - " ADD CONSTRAINT `fk_tbl_derived2_to_tbl_base_id`\n" + " ADD CONSTRAINT `fk_tbl_derived2_tbl_base_id`\n" " FOREIGN KEY IF NOT EXISTS (`tbl_base_id`)\n" " REFERENCES `test`.`tbl_base` (`tbl_base_id`)\n" " ON DELETE CASCADE\n" " ON UPDATE CASCADE,\n" - " ADD CONSTRAINT `fk_tbl_derived2_to_tbl_test2_id_test2_nullable`\n" + " ADD CONSTRAINT `fk_tbl_derived2_tbl_test2_test2_nullable`\n" " FOREIGN KEY IF NOT EXISTS (`tbl_test2_id_test2_nullable`)\n" " REFERENCES `test`.`tbl_test2` (`tbl_test2_id`)\n" " ON DELETE SET NULL\n" " ON UPDATE NO ACTION,\n" - " ADD CONSTRAINT `fk_tbl_derived2_to_tbl_test2_id_test2_ptr_u`\n" + " ADD CONSTRAINT `fk_tbl_derived2_tbl_test2_test2_ptr_u`\n" " FOREIGN KEY IF NOT EXISTS (`tbl_test2_id_test2_ptr_u`)\n" " REFERENCES `test`.`tbl_test2` (`tbl_test2_id`)\n" " ON DELETE SET NULL\n" " ON UPDATE NO ACTION,\n" - " ADD CONSTRAINT `fk_tbl_derived2_to_tbl_test2_id_test2_ptr_s`\n" + " ADD CONSTRAINT `fk_tbl_derived2_tbl_test2_test2_ptr_s`\n" " FOREIGN KEY IF NOT EXISTS (`tbl_test2_id_test2_ptr_s`)\n" " REFERENCES `test`.`tbl_test2` (`tbl_test2_id`)\n" " ON DELETE SET NULL\n" " ON UPDATE NO ACTION"); expect_query(mock, "ALTER TABLE `tbl_derived3`\n" - " ADD CONSTRAINT `fk_tbl_derived3_to_tbl_derived2_id`\n" + " ADD CONSTRAINT `fk_tbl_derived3_tbl_derived2_id`\n" " FOREIGN KEY IF NOT EXISTS (`tbl_derived2_id`)\n" " REFERENCES `test`.`tbl_derived2` (`tbl_derived2_id`)\n" " ON DELETE CASCADE\n" " ON UPDATE CASCADE"); expect_query(mock, "ALTER TABLE `tbl_dummy_id`\n" - " ADD CONSTRAINT `fk_tbl_dummy_id_to_tbl_dummy_owner_id_dummies`\n" + " ADD CONSTRAINT `fk_tbl_dummy_id_tbl_dummy_owner_dummies`\n" " FOREIGN KEY IF NOT EXISTS (`tbl_dummy_owner_id_dummies`)\n" " REFERENCES `test`.`tbl_dummy_owner` (`tbl_dummy_owner_id`)\n" " ON DELETE SET NULL\n" " ON UPDATE NO ACTION"); expect_query(mock, "ALTER TABLE `tbl_double_usage_item`\n" - " ADD CONSTRAINT `fk_tbl_double_usage_item_to_tbl_double_usage_id_single_item`\n" + " ADD CONSTRAINT `fk_tbl_double_usage_item_tbl_double_usage_single_item`\n" " FOREIGN KEY IF NOT EXISTS (`tbl_double_usage_id_single_item`)\n" " REFERENCES `test`.`tbl_double_usage` (`tbl_double_usage_id`)\n" " ON DELETE SET NULL\n" " ON UPDATE NO ACTION,\n" - " ADD CONSTRAINT `fk_tbl_double_usage_item_to_tbl_double_usage_id_multiple_items`\n" + " ADD CONSTRAINT `fk_tbl_double_usage_item_tbl_double_usage_multiple_items`\n" " FOREIGN KEY IF NOT EXISTS (`tbl_double_usage_id_multiple_items`)\n" " REFERENCES `test`.`tbl_double_usage` (`tbl_double_usage_id`)\n" " ON DELETE SET NULL\n" " ON UPDATE NO ACTION"); expect_query(mock, "ALTER TABLE `tbl_double_usage_wrapper`\n" - " ADD CONSTRAINT `fk_tbl_double_usage_wrapper_to_tbl_double_usage_id_double_usage`\n" + " ADD CONSTRAINT `fk_tbl_double_usage_wrapper_tbl_double_usage_double_usage`\n" " FOREIGN KEY IF NOT EXISTS (`tbl_double_usage_id_double_usage`)\n" " REFERENCES `test`.`tbl_double_usage` (`tbl_double_usage_id`)\n" " ON DELETE SET NULL\n" @@ -297,4 +297,4 @@ TEST(CppHibernateTests, init) ::cppmariadb::connection connection(reinterpret_cast(0x1111)); auto context = make_context(test_schema, connection); context.init(true); -} \ No newline at end of file +}