Переглянути джерело

* fixed cmake tests

master
bergmann 7 роки тому
джерело
коміт
fbffc8dcac
4 змінених файлів з 7 додано та 11 видалено
  1. +1
    -1
      CMakeLists.txt
  2. +1
    -1
      src/cpphibernate/driver/mariadb/schema/field.cpp
  3. +0
    -4
      src/cpphibernate/driver/mariadb/schema/table.cpp
  4. +5
    -5
      test/cpphibernate_update.cpp

+ 1
- 1
CMakeLists.txt Переглянути файл

@@ -1,7 +1,7 @@
# Initialize CMake ################################################################################ # Initialize CMake ################################################################################


CMake_Minimum_Required ( VERSION 3.5.1 FATAL_ERROR ) CMake_Minimum_Required ( VERSION 3.5.1 FATAL_ERROR )
Include ( CTest )
If ( NOT CMAKE_BUILD_TYPE ) If ( NOT CMAKE_BUILD_TYPE )
Set ( CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build!" FORCE ) Set ( CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build!" FORCE )
EndIf ( NOT CMAKE_BUILD_TYPE ) EndIf ( NOT CMAKE_BUILD_TYPE )


+ 1
- 1
src/cpphibernate/driver/mariadb/schema/field.cpp Переглянути файл

@@ -199,7 +199,7 @@ throw_not_implemented(::cppmariadb::statement&, get_statement_foreign_many_updat
<< ref_key_info.table_name << ref_key_info.table_name
<< "_id_" << "_id_"
<< field_name << field_name
<< "`!= "
<< "`!="
<< ref_key_info.convert_to_open << ref_key_info.convert_to_open
<< "?\?" << "?\?"
<< ref_key_info.convert_to_close << ref_key_info.convert_to_close


+ 0
- 4
src/cpphibernate/driver/mariadb/schema/table.cpp Переглянути файл

@@ -1410,14 +1410,10 @@ std::string table_t::build_delete_query(const std::string* where) const
auto& base_key = *base_table->primary_key_field; auto& base_key = *base_table->primary_key_field;
std::ostringstream os; std::ostringstream os;
os << "SELECT `" os << "SELECT `"
<< key_info.table_name
<< "`.`"
<< key_info.field_name << key_info.field_name
<< "` FROM `" << "` FROM `"
<< key_info.table_name << key_info.table_name
<< "` WHERE `" << "` WHERE `"
<< key_info.table_name
<< "`.`"
<< base_key.table_name << base_key.table_name
<< "_id`=?\?"; << "_id`=?\?";
_statement_key_from_base.reset(new ::cppmariadb::statement(os.str())); _statement_key_from_base.reset(new ::cppmariadb::statement(os.str()));


+ 5
- 5
test/cpphibernate_update.cpp Переглянути файл

@@ -165,7 +165,7 @@ TEST(CppHibernateTests, update_derived1)
"`tbl_derived1` " "`tbl_derived1` "
"WHERE " "WHERE "
"`tbl_derived1_id`=UuidToBin('X3d12758c-abb9-11e8-98d0-529269fb1459X') AND " "`tbl_derived1_id`=UuidToBin('X3d12758c-abb9-11e8-98d0-529269fb1459X') AND "
"`tbl_test1_id_test1_data`!= UuidToBin('Xe2488a64-b843-11e8-96f8-529269fb1459X')"
"`tbl_test1_id_test1_data`!=UuidToBin('Xe2488a64-b843-11e8-96f8-529269fb1459X')"
")"); ")");
expect_query(mock, "UPDATE " expect_query(mock, "UPDATE "
"`tbl_derived1` " "`tbl_derived1` "
@@ -238,7 +238,7 @@ TEST(CppHibernateTests, update_derived2)
"`tbl_derived2` " "`tbl_derived2` "
"WHERE " "WHERE "
"`tbl_derived2_id`=UuidToBin('X3d127bcc-abb9-11e8-98d0-529269fb1459X') AND " "`tbl_derived2_id`=UuidToBin('X3d127bcc-abb9-11e8-98d0-529269fb1459X') AND "
"`tbl_test2_id_test2_nullable`!= UuidToBin('X3d1283a6-abb9-11e8-98d0-529269fb1459X')"
"`tbl_test2_id_test2_nullable`!=UuidToBin('X3d1283a6-abb9-11e8-98d0-529269fb1459X')"
")"); ")");
expect_query(mock, "SELECT Uuid()", expect_query(mock, "SELECT Uuid()",
result_used({ result_used({
@@ -265,7 +265,7 @@ TEST(CppHibernateTests, update_derived2)
"`tbl_derived2` " "`tbl_derived2` "
"WHERE " "WHERE "
"`tbl_derived2_id`=UuidToBin('X3d127bcc-abb9-11e8-98d0-529269fb1459X') AND " "`tbl_derived2_id`=UuidToBin('X3d127bcc-abb9-11e8-98d0-529269fb1459X') AND "
"`tbl_test2_id_test2_ptr_u`!= UuidToBin('Xec0f0aac-b8b9-11e8-96f8-529269fb1459X')"
"`tbl_test2_id_test2_ptr_u`!=UuidToBin('Xec0f0aac-b8b9-11e8-96f8-529269fb1459X')"
")"); ")");
expect_query(mock, "DELETE " expect_query(mock, "DELETE "
"`tbl_test2` " "`tbl_test2` "
@@ -548,11 +548,11 @@ TEST(CppHibernateTests, update_dynamic_base)


expect_query(mock, "START TRANSACTION"); expect_query(mock, "START TRANSACTION");
expect_query(mock, "SELECT " expect_query(mock, "SELECT "
"`tbl_derived2`.`tbl_derived2_id` "
"`tbl_derived2_id` "
"FROM " "FROM "
"`tbl_derived2` " "`tbl_derived2` "
"WHERE " "WHERE "
"`tbl_derived2`.`tbl_base_id`='Xf9f13c08-c6e2-11e8-a8d5-f2801f1b9fd1X'",
"`tbl_base_id`='Xf9f13c08-c6e2-11e8-a8d5-f2801f1b9fd1X'",
result_stored({ result_stored({
{ "ae0e7888-c6e6-11e8-a8d5-f2801f1b9fd1" } { "ae0e7888-c6e6-11e8-a8d5-f2801f1b9fd1" }
})); }));


Завантаження…
Відмінити
Зберегти