Merge pull request #7 from zhimin-dev/vite

fix sql to model bug

Author: zmisgod

manifest.json

@@ -1,7 +1,7 @@
 {
   "name": "dev-tool",
   "description": "a dev-tool for chrome extension",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "manifest_version": 3,
   "permissions": [
     "alarms", 

src/components/SqlToModel.vue

@@ -13,7 +13,7 @@
     <div class="show-go" v-if="goStruct !== ''">
       <el-input
         type="textarea"
-        autosize="true"
+        :autosize="true"
         placeholder="显示的GoStruct"
         v-model="goStruct"
       ></el-input>

src/components/Time.vue

@@ -55,9 +55,8 @@ export default {
   },
   created() {
     setInterval(() => {
-      navigator.clipboard
-        .readText()
-        .then((res) => {
+      if (document.hasFocus()) {
+        navigator.clipboard.readText().then((res) => {
           if (!this.checkClipboardExist(res)) {
             if (parseInt(res) == res) {
               this.nowTime = res;
@@ -66,10 +65,8 @@ export default {
             }
             localStorage.setItem(copyFromClipboard, res);
           }
-        })
-        .catch((e) => {
-          console.log(e);
         });
+      }
     }, 1000);
 
     let item = localStorage.getItem(lastTimStr);

src/utils/go/common.js

@@ -4,14 +4,14 @@ function ucFirst(val) {
 
 function dbNameToCamelCase(name) {
   if (name === undefined) {
-    return '';
+    return "";
   }
   const row = [];
-  const re = name.split('_');
+  const re = name.split("_");
   re.map((val) => {
     row.push(ucFirst(val));
   });
-  return row.join('');
+  return row.join("");
 }
 
 function containStr(name, val) {
@@ -22,61 +22,76 @@ function containStr(name, val) {
 }
 
 function isTimeType(type) {
-  if (containStr(type, 'date') || containStr(type, 'datetime') || containStr(type, 'timestamp')) {
+  if (
+    containStr(type, "date") ||
+    containStr(type, "datetime") ||
+    containStr(type, "timestamp")
+  ) {
     return true;
   }
   return false;
 }
 
 function sqlTypeToGoType(type) {
   let isContainUsign = false;
-  if (containStr(type, 'unsigned')) {
+  if (containStr(type, "unsigned")) {
     isContainUsign = true;
   }
-  if (containStr(type, 'varchar') || containStr(type, 'text')) {
-    return 'string';
+  if (containStr(type, "varchar") || containStr(type, "text")) {
+    return "string";
   }
-  if (containStr(type, 'int')) {
+  if (containStr(type, "int")) {
     if (!isContainUsign) {
-      return 'int64';
+      return "int64";
     }
-    return 'uint64';
+    return "uint64";
   }
-  if (containStr(type, 'float')) {
-    return 'float64';
+  if (containStr(type, "float")) {
+    return "float64";
   }
-  if (containStr(type, 'decimal')) {
-    return 'float64';
+  if (containStr(type, "decimal")) {
+    return "float64";
   }
   if (isTimeType(type)) {
-    return 'time.Time';
+    return "time.Time";
   }
-  return 'unknown';
+  return "unknown";
 }
 
 function sqlToModel(data) {
   const dbName = data.tableName;
   const dbNameStr = dbNameToCamelCase(dbName);
-  const packageName = 'db';
+  const dbComment = data.comment;
+  const packageName = "db";
   const importPackages = [];
-  let importPackageStr = '';
-  let columsStr = '';
+  let importPackageStr = "";
+  let columsStr = "";
   let isTime = false;
   data.columns.map((val) => {
-    let defaultStr = '';
-    if (val.default !== undefined && val.default !== 'NULL' && val.default !== '') {
+    let defaultStr = "";
+    if (
+      val.default !== undefined &&
+      val.default !== "NULL" &&
+      val.default !== ""
+    ) {
       defaultStr = `;default:${val.default}`;
     }
     const goType = sqlTypeToGoType(val.type);
     if (!isTime && isTimeType(val.type)) {
       isTime = true;
     }
-    columsStr += `  ${dbNameToCamelCase(val.name)} ${goType} \`gorm:"column:${val.name}${defaultStr}" json:"${val.name}"\`\n`;
+    columsStr += `  ${dbNameToCamelCase(val.name)} ${goType} \`gorm:"column:${
+      val.name
+    }${defaultStr}" json:"${val.name}"\``;
+    if (val.comment !== "") {
+      columsStr += `//${val.comment}`;
+    }
+    columsStr += "\n";
   });
   if (isTime) {
-    importPackages.push('time');
+    importPackages.push("time");
   }
-  let importStr = '';
+  let importStr = "";
   if (importPackages.length > 0) {
     importPackages.map((val) => {
       importPackageStr += `"${val}"\n`;
@@ -93,16 +108,17 @@ type ${dbNameStr}Model struct {
 ${columsStr}
 }
 func (*${dbNameStr}Model) TableName() string {
-  return "${dbName}"
+  return "${dbName}"//${dbComment}
 }
 `;
   return resultStr;
 }
 
 // 解析sql表明等基础信息
 function sqlStrToGoTemplate(str) {
-  // CREATE TABLE `(.*)`\s\(\s((.*\s)*)\)\s(.*)COMMENT='(.*)'
-  const regex = /CREATE TABLE `(.*)`\s\(\s((.*\s)*)\)\s(.*)COMMENT='(.*)'/gm;
+  // CREATE TABLE `(.*)`\s\(\s((.*\s)*)\)\s(ENGINE=\w*\s)?(AUTO_INCREMENT=\d*\s)?(DEFAULT\s)?(CHARSET=\w+\s)?(COLLATE=\w*\s)?(ROW_FORMAT\=DYNAMIC\s)?(COMMENT='(.*)')?
+  const regex =
+    /CREATE TABLE `(.*)`\s\(\s((.*\s)*)\)\s(ENGINE=\w*\s)?(AUTO_INCREMENT=\d*\s)?(DEFAULT\s)?(CHARSET=\w+\s)?(COLLATE=\w*\s)?(ROW_FORMAT\=DYNAMIC\s)?(COMMENT='(.*)')?/gm;
   // `(.*)`\s(\w+[\((\d+)\)]*[\sunsigned\s]*)([NOT\s[NULL\s]*]*)(DEFAULT\s([\'](.*?)[\']|NULL)\s)*(AUTO_INCREMENT\s)*(COMMENT\s[\'](.*)[\'])*
   // const columnRegex = /`(.*)`\s(\w+[\((\d+)\)]*[\sunsigned\s]*)([NOT\s[NULL\s]*]*)(DEFAULT\s([\'](.*?)[\']|NULL)\s)*(AUTO_INCREMENT\s)*(COMMENT\s[\'](.*)[\'])*/gm;
   let m;
@@ -121,14 +137,25 @@ function sqlStrToGoTemplate(str) {
   return sqlStrColumnToEachColumn(data);
 }
 
+function getExpValue(str) {
+  let exp = str.split("=");
+  if (exp.length >= 2) {
+    return exp[1].trim();
+  }
+  return "";
+}
+
 // 解析sql每个字段
 function sqlStrColumnToEachColumn(data) {
-  const regex = /`(.*)`\s(\w+[\((\d+)\)]*[\sunsigned\s]*)([NOT\s[NULL\s]*]*)(DEFAULT\s([\'](.*?)[\']|NULL)\s)*(AUTO_INCREMENT\s)*(COMMENT\s[\'](.*)[\'])*/gm;
+  const regex =
+    /`(.*)`\s(\w+[\((\d+)\)]*[\sunsigned\s]*)([NOT\s[NULL\s]*]*)(DEFAULT\s([\'](.*?)[\']|NULL)\s)*(AUTO_INCREMENT\s)*(COMMENT\s[\'](.*)[\'])*/gm;
   const tableInfo = {
     tableName: data[1],
-    engine: data[3],
-    increasement: data[4],
-    dafaultCharset: data[6],
+    engine: getExpValue(data[4]),
+    increasement: getExpValue(data[5]),
+    dafaultCharset: getExpValue(data[7]),
+    comment: data[11],
+    rowFormat: getExpValue(data[9]),
   };
   const str = data[2];
   const columns = [];
@@ -147,11 +174,23 @@ function sqlStrColumnToEachColumn(data) {
   }
   const columnData = [];
   columns.map((column) => {
+    let _comment = column[9];
+    if (
+      _comment === undefined ||
+      _comment === null ||
+      _comment === "undefined"
+    ) {
+      _comment = "";
+    }
     columnData.push({
-      name: column[1], type: column[2], default: column[6], comment: column[9],
+      name: column[1],
+      type: column[2],
+      default: column[6],
+      comment: _comment,
     });
   });
   tableInfo.columns = columnData;
+  console.log("tableInfo---", tableInfo);
   return sqlToModel(tableInfo);
 }