Rooba
/
drogon
mirror of https://github.com/drogonframework/drogon.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix an error with missing composite key to sqlite3 ORM generator (#673)

This commit is contained in:
丁盟 2021-01-05 22:14:31 +08:00 committed by GitHub
parent f26450f04b
commit 64e916ccb3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drogon_ctl/create_model.cc
View File

@ -548,7 +548,7 @@ void create_model::createModelClassFromSqlite3(
for (auto &row : result) for (auto &row : result)
{ {
bool notnull = row["notnull"].as<bool>(); bool notnull = row["notnull"].as<bool>();
bool primary = row["pk"].as<bool>(); bool primary = row["pk"].as<int>();
auto type = row["type"].as<std::string>(); auto type = row["type"].as<std::string>();
std::transform(type.begin(), type.end(), type.begin(), tolower); std::transform(type.begin(), type.end(), type.begin(), tolower);
ColumnInfo info; ColumnInfo info;
@ -627,13 +627,14 @@ void create_model::createModelClassFromSqlite3(
std::cerr << e.base().what() << std::endl; std::cerr << e.base().what() << std::endl;
exit(1); exit(1);
}; };
std::vector<std::string> pkNames, pkTypes; std::vector<std::string> pkNames, pkTypes, pkValNames;
for (auto const &col : cols) for (auto const &col : cols)
{ {
if (col.isPrimaryKey_) if (col.isPrimaryKey_)
{ {
pkNames.push_back(col.colName_); pkNames.push_back(col.colName_);
pkTypes.push_back(col.colType_); pkTypes.push_back(col.colType_);
pkValNames.push_back(nameTransform(col.colName_, false));
} }
} }
data["hasPrimaryKey"] = (int)pkNames.size(); data["hasPrimaryKey"] = (int)pkNames.size();
@ -646,6 +647,7 @@ void create_model::createModelClassFromSqlite3(
{ {
data["primaryKeyName"] = pkNames; data["primaryKeyName"] = pkNames;
data["primaryKeyType"] = pkTypes; data["primaryKeyType"] = pkTypes;
data["primaryKeyValNames"] = pkValNames;
} }
data["columns"] = cols; data["columns"] = cols;
std::ofstream headerFile(path + "/" + className + ".h", std::ofstream::out); std::ofstream headerFile(path + "/" + className + ".h", std::ofstream::out);