From b34b3a6068e91ccb0e3b9fc8272c95ff6219f5da Mon Sep 17 00:00:00 2001
From: An Tao <antao2002@gmail.com>
Date: Wed, 20 Nov 2019 13:39:56 +0800
Subject: [PATCH] Fix a bug in dg_ctl for creating models of sqlite3 (#297)

---
 drogon_ctl/create_model.cc | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/drogon_ctl/create_model.cc b/drogon_ctl/create_model.cc
index 6b38f5f5..2e0d7a2a 100644
--- a/drogon_ctl/create_model.cc
+++ b/drogon_ctl/create_model.cc
@@ -30,7 +30,12 @@
 #include <unistd.h>
 
 using namespace drogon_ctl;
-
+static std::string toLower(const std::string &str)
+{
+    auto ret = str;
+    std::transform(ret.begin(), ret.end(), ret.begin(), tolower);
+    return ret;
+}
 static std::map<std::string, std::vector<Relationship>> getRelationships(
     const Json::Value &relationships)
 {
@@ -80,7 +85,7 @@ void create_model::createModelClassFromPG(
     auto className = nameTransform(tableName, true);
     HttpViewData data;
     data["className"] = className;
-    data["tableName"] = tableName;
+    data["tableName"] = toLower(tableName);
     data["hasPrimaryKey"] = (int)0;
     data["primaryKeyName"] = "";
     data["dbName"] = _dbname;
@@ -321,10 +326,6 @@ void create_model::createModelFromPG(
             const std::string &comment) {
             if (!isNull)
             {
-                std::transform(tableName.begin(),
-                               tableName.end(),
-                               tableName.begin(),
-                               tolower);
                 std::cout << "table name:" << tableName << std::endl;
 
                 createModelClassFromPG(path,
@@ -353,7 +354,7 @@ void create_model::createModelClassFromMysql(
     auto className = nameTransform(tableName, true);
     HttpViewData data;
     data["className"] = className;
-    data["tableName"] = tableName;
+    data["tableName"] = toLower(tableName);
     data["hasPrimaryKey"] = (int)0;
     data["primaryKeyName"] = "";
     data["dbName"] = _dbname;
@@ -495,10 +496,6 @@ void create_model::createModelFromMysql(
                                                       std::string &&tableName) {
         if (!isNull)
         {
-            std::transform(tableName.begin(),
-                           tableName.end(),
-                           tableName.begin(),
-                           tolower);
             std::cout << "table name:" << tableName << std::endl;
             createModelClassFromMysql(path,
                                       client,
@@ -537,7 +534,7 @@ void create_model::createModelClassFromSqlite3(
                     auto className = nameTransform(tableName, true);
                     HttpViewData data;
                     data["className"] = className;
-                    data["tableName"] = tableName;
+                    data["tableName"] = toLower(tableName);
                     data["hasPrimaryKey"] = (int)0;
                     data["primaryKeyName"] = "";
                     data["dbName"] = std::string("sqlite3");
@@ -666,10 +663,6 @@ void create_model::createModelFromSqlite3(
         [&](bool isNull, std::string &&tableName) mutable {
             if (!isNull)
             {
-                std::transform(tableName.begin(),
-                               tableName.end(),
-                               tableName.begin(),
-                               tolower);
                 std::cout << "table name:" << tableName << std::endl;
                 createModelClassFromSqlite3(path,
                                             client,