diff options
| author | Sadie Powell <sadie@witchery.services> | 2024-05-16 18:00:13 +0100 |
|---|---|---|
| committer | Sadie Powell <sadie@witchery.services> | 2024-05-16 18:00:13 +0100 |
| commit | a4792412ba497ed30f5c77c59ddc226c5289ebc4 (patch) | |
| tree | b850f36cade5f8177134f65ee3ffe1bb659ef579 /modules | |
| parent | cb21c7c1fa7e956aafdd4fd17de3ddad4fd45fc2 (diff) | |
| parent | 8bb83f6b1a667121ba68f5c191b9f953af6f22bd (diff) | |
Merge branch '2.0' into 2.1.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/botserv/bs_kick.cpp | 21 | ||||
| -rw-r--r-- | modules/extra/mysql.cpp | 6 |
2 files changed, 13 insertions, 14 deletions
diff --git a/modules/botserv/bs_kick.cpp b/modules/botserv/bs_kick.cpp index 4d21256bc..7d67a6577 100644 --- a/modules/botserv/bs_kick.cpp +++ b/modules/botserv/bs_kick.cpp @@ -53,17 +53,16 @@ struct KickerDataImpl final if (kd == NULL) return; - data["kickerdata:amsgs"] << kd->amsgs; - data["kickerdata:badwords"] << kd->badwords; - data["kickerdata:bolds"] << kd->bolds; - data["kickerdata:caps"] << kd->caps; - data["kickerdata:colors"] << kd->colors; - data["kickerdata:flood"] << kd->flood; - data["kickerdata:italics"] << kd->italics; - data["kickerdata:repeat"] << kd->repeat; - data["kickerdata:reverses"] << kd->reverses; - data["kickerdata:underlines"] << kd->underlines; - + data.SetType("kickerdata:amsgs", Serialize::Data::DT_INT); data["kickerdata:amsgs"] << kd->amsgs; + data.SetType("kickerdata:badwords", Serialize::Data::DT_INT); data["kickerdata:badwords"] << kd->badwords; + data.SetType("kickerdata:bolds", Serialize::Data::DT_INT); data["kickerdata:bolds"] << kd->bolds; + data.SetType("kickerdata:caps", Serialize::Data::DT_INT); data["kickerdata:caps"] << kd->caps; + data.SetType("kickerdata:colors", Serialize::Data::DT_INT); data["kickerdata:colors"] << kd->colors; + data.SetType("kickerdata:flood", Serialize::Data::DT_INT); data["kickerdata:flood"] << kd->flood; + data.SetType("kickerdata:italics", Serialize::Data::DT_INT); data["kickerdata:italics"] << kd->italics; + data.SetType("kickerdata:repeat", Serialize::Data::DT_INT); data["kickerdata:repeat"] << kd->repeat; + data.SetType("kickerdata:reverses", Serialize::Data::DT_INT); data["kickerdata:reverses"] << kd->reverses; + data.SetType("kickerdata:underlines", Serialize::Data::DT_INT); data["kickerdata:underlines"] << kd->underlines; data.SetType("capsmin", Serialize::Data::DT_INT); data["capsmin"] << kd->capsmin; data.SetType("capspercent", Serialize::Data::DT_INT); data["capspercent"] << kd->capspercent; data.SetType("floodlines", Serialize::Data::DT_INT); data["floodlines"] << kd->floodlines; diff --git a/modules/extra/mysql.cpp b/modules/extra/mysql.cpp index aa9986db9..6cb8e4b45 100644 --- a/modules/extra/mysql.cpp +++ b/modules/extra/mysql.cpp @@ -415,11 +415,11 @@ std::vector<Query> MySQLService::CreateTable(const Anope::string &table, const D query_text += ", `" + column + "` "; if (data.GetType(column) == Serialize::Data::DT_INT) - query_text += "int(11)"; + query_text += "int"; else query_text += "text"; } - query_text += ", PRIMARY KEY (`id`), KEY `timestamp_idx` (`timestamp`))"; + query_text += ", PRIMARY KEY (`id`), KEY `timestamp_idx` (`timestamp`)) ROW_FORMAT=DYNAMIC"; queries.push_back(query_text); } else @@ -433,7 +433,7 @@ std::vector<Query> MySQLService::CreateTable(const Anope::string &table, const D Anope::string query_text = "ALTER TABLE `" + table + "` ADD `" + column + "` "; if (data.GetType(column) == Serialize::Data::DT_INT) - query_text += "int(11)"; + query_text += "int"; else query_text += "text"; |