used utf8mb4_uca1400_ai_ci for MariaDB

silverqx · Jun 5, 2024 · 07513aa · 07513aa
1 parent 0c4ef23
commit 07513aa
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/examples/tom/main.cpp b/examples/tom/main.cpp
@@ -106,7 +106,7 @@ std::shared_ptr<DatabaseManager> setupDatabaseManager()
             {password_,       qEnvironmentVariable("DB_MARIA_PASSWORD",  EMPTY)},
             {charset_,        qEnvironmentVariable("DB_MARIA_CHARSET",   UTF8MB4)},
             {collation_,      qEnvironmentVariable("DB_MARIA_COLLATION",
-                                                   UTF8MB4Unicode520ci)},
+                                                   UTF8MB4Uca1400aici)},
             // SYSTEM - set the time zone to your local MySQL server time zone
             {timezone_,       TZ00},
             /* Specifies what time zone all QDateTime-s will have, the overridden default

diff --git a/include/orm/constants_extern.hpp b/include/orm/constants_extern.hpp
@@ -157,7 +157,7 @@ namespace Orm::Constants
     SHAREDLIB_EXPORT extern const QString UTF8Unicodeci;
     SHAREDLIB_EXPORT extern const QString UTF8MB4Unicode520ci;
     SHAREDLIB_EXPORT extern const QString UTF8MB40900aici;
-    SHAREDLIB_EXPORT extern const QString Uca1400Nopadaici;
+    SHAREDLIB_EXPORT extern const QString UTF8MB4Uca1400aici;
     SHAREDLIB_EXPORT extern const QString UcsBasic;
     SHAREDLIB_EXPORT extern const QString POSIX_;
 

diff --git a/include/orm/constants_inline.hpp b/include/orm/constants_inline.hpp
@@ -164,7 +164,7 @@ namespace Orm::Constants
     inline const QString UTF8Unicodeci       = QStringLiteral("utf8_unicode_ci");
     inline const QString UTF8MB4Unicode520ci = QStringLiteral("utf8mb4_unicode_520_ci");
     inline const QString UTF8MB40900aici     = QStringLiteral("utf8mb4_0900_ai_ci");
-    inline const QString Uca1400Nopadaici    = QStringLiteral("uca1400_nopad_ai_ci");
+    inline const QString UTF8MB4Uca1400aici  = QStringLiteral("utf8mb4_uca1400_ai_ci"); // MariaDB 11.5
     inline const QString UcsBasic            = QStringLiteral("ucs_basic");
     inline const QString POSIX_              = QStringLiteral("POSIX");
 

diff --git a/src/orm/constants_extern.cpp b/src/orm/constants_extern.cpp
@@ -146,7 +146,7 @@ namespace Orm::Constants
     const QString UTF8Unicodeci       = QStringLiteral("utf8_unicode_ci");
     const QString UTF8MB4Unicode520ci = QStringLiteral("utf8mb4_unicode_520_ci");
     const QString UTF8MB40900aici     = QStringLiteral("utf8mb4_0900_ai_ci");
-    const QString Uca1400Nopadaici    = QStringLiteral("uca1400_nopad_ai_ci");
+    const QString UTF8MB4Uca1400aici  = QStringLiteral("utf8mb4_uca1400_ai_ci"); // MariaDB 11.5
     const QString UcsBasic            = QStringLiteral("ucs_basic");
     const QString POSIX_              = QStringLiteral("POSIX");
 

diff --git a/tests/TinyUtils/src/databases.cpp b/tests/TinyUtils/src/databases.cpp
@@ -30,7 +30,7 @@ using Orm::Constants::UTC;
 using Orm::Constants::UTF8;
 using Orm::Constants::UTF8MB4;
 using Orm::Constants::UTF8MB40900aici;
-using Orm::Constants::UTF8MB4Unicode520ci;
+using Orm::Constants::UTF8MB4Uca1400aici;
 using Orm::Constants::InnoDB;
 using Orm::Constants::Version;
 using Orm::Constants::application_name;
@@ -674,7 +674,7 @@ Databases::mariaConfiguration()
         {password_,       qEnvironmentVariable("DB_MARIA_PASSWORD",  EMPTY)},
         {charset_,        qEnvironmentVariable("DB_MARIA_CHARSET",   UTF8MB4)},
         {collation_,      qEnvironmentVariable("DB_MARIA_COLLATION",
-                                               UTF8MB4Unicode520ci)},
+                                               UTF8MB4Uca1400aici)},
         // Very important for tests
         {timezone_,       TZ00},
         /* Specifies what time zone all QDateTime-s will have, the overridden default

diff --git a/tests/testdata_tom/main.cpp b/tests/testdata_tom/main.cpp
@@ -121,7 +121,7 @@ std::shared_ptr<DatabaseManager> setupDatabaseManager()
             {password_,       qEnvironmentVariable("DB_MARIA_PASSWORD",  EMPTY)},
             {charset_,        qEnvironmentVariable("DB_MARIA_CHARSET",   UTF8MB4)},
             {collation_,      qEnvironmentVariable("DB_MARIA_COLLATION",
-                                                   UTF8MB4Unicode520ci)},
+                                                   UTF8MB4Uca1400aici)},
             // SYSTEM - set the time zone to your local MySQL server time zone
             {timezone_,       TZ00},
             /* Specifies what time zone all QDateTime-s will have, the overridden default

diff --git a/tom/include/tom/migration.hpp b/tom/include/tom/migration.hpp
@@ -169,8 +169,8 @@ namespace Migrations
     using TINYORM_PREPEND_NAMESPACE(Orm::Constants::UTF8MB4Unicode520ci); // NOLINT(misc-unused-using-decls)
     /*! Alias for the string constant "utf8mb4_0900_ai_ci". */
     using TINYORM_PREPEND_NAMESPACE(Orm::Constants::UTF8MB40900aici); // NOLINT(misc-unused-using-decls)
-    /*! Alias for the string constant "uca1400_nopad_ai_ci". */
-    using TINYORM_PREPEND_NAMESPACE(Orm::Constants::Uca1400Nopadaici); // NOLINT(misc-unused-using-decls)
+    /*! Alias for the string constant "utf8mb4_uca1400_ai_ci". */
+    using TINYORM_PREPEND_NAMESPACE(Orm::Constants::UTF8MB4Uca1400aici); // NOLINT(misc-unused-using-decls)
     /*! Alias for the string constant "ucs_basic". */
     using TINYORM_PREPEND_NAMESPACE(Orm::Constants::UcsBasic); // NOLINT(misc-unused-using-decls)
     /*! Alias for the string constant "POSIX". */

diff --git a/tom/include/tom/seeder.hpp b/tom/include/tom/seeder.hpp
@@ -286,8 +286,8 @@ namespace Seeders
     using TINYORM_PREPEND_NAMESPACE(Orm::Constants::UTF8MB4Unicode520ci); // NOLINT(misc-unused-using-decls)
     /*! Alias for the string constant "utf8mb4_0900_ai_ci". */
     using TINYORM_PREPEND_NAMESPACE(Orm::Constants::UTF8MB40900aici); // NOLINT(misc-unused-using-decls)
-    /*! Alias for the string constant "uca1400_nopad_ai_ci". */
-    using TINYORM_PREPEND_NAMESPACE(Orm::Constants::Uca1400Nopadaici); // NOLINT(misc-unused-using-decls)
+    /*! Alias for the string constant "utf8mb4_uca1400_ai_ci". */
+    using TINYORM_PREPEND_NAMESPACE(Orm::Constants::UTF8MB4Uca1400aici); // NOLINT(misc-unused-using-decls)
     /*! Alias for the string constant "ucs_basic". */
     using TINYORM_PREPEND_NAMESPACE(Orm::Constants::UcsBasic); // NOLINT(misc-unused-using-decls)
     /*! Alias for the string constant "POSIX". */