Skip to content

Commit d5603b0

Browse files
committed
Update common.js
1 parent 44981be commit d5603b0

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

src/utils/go/common.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ function ucFirst(val) {
33
}
44

55
function dbNameToCamelCase(name) {
6+
if (name === undefined) {
7+
return '';
8+
}
69
const row = [];
710
const re = name.split('_');
811
re.map((val) => {
@@ -82,25 +85,24 @@ function sqlToModel(data) {
8285
${importPackageStr}
8386
)`;
8487
}
85-
const resultStr = `
86-
package ${packageName}
88+
const resultStr = `package ${packageName}
8789
${importStr}
8890
var New${dbNameStr} ${dbNameStr}Model
91+
8992
type ${dbNameStr}Model struct {
9093
${columsStr}
9194
}
9295
func (*${dbNameStr}Model) TableName() string {
9396
return "${dbName}"
9497
}
9598
`;
96-
console.log(resultStr);
9799
return resultStr;
98100
}
99101

100102
// 解析sql表明等基础信息
101103
function sqlStrToGoTemplate(str) {
102104
// CREATE TABLE `(.*)`\s\(([\d\D]*)\)\sENGINE=(.*)\sAUTO_INCREMENT=(\d+)\s(\w+)\sCHARSET=(\w+)\s(COLLATE=\w+)*
103-
const regex = /CREATE TABLE `(.*)`\s\(([\d\D]*)\)\sENGINE=(.*)\sAUTO_INCREMENT=(\d+)\s(\w+)\sCHARSET=(\w+)\s(COLLATE=\w+)*/gm;
105+
const regex = /CREATE TABLE `(.*)`\s\(([\d\D]*)\)\sENGINE=(.*)\s(AUTO_INCREMENT=(.*)\s)*(\w+)\sCHARSET=(\w+)\s(COLLATE=\w+)*/gm;
104106
// `(.*)`\s(\w+[\((\d+)\)]*[\sunsigned\s]*)([NOT\s[NULL\s]*]*)(DEFAULT\s([\'](.*?)[\']|NULL)\s)*(AUTO_INCREMENT\s)*(COMMENT\s[\'](.*)[\'])*
105107
// const columnRegex = /`(.*)`\s(\w+[\((\d+)\)]*[\sunsigned\s]*)([NOT\s[NULL\s]*]*)(DEFAULT\s([\'](.*?)[\']|NULL)\s)*(AUTO_INCREMENT\s)*(COMMENT\s[\'](.*)[\'])*/gm;
106108
let m;
@@ -150,6 +152,7 @@ function sqlStrColumnToEachColumn(data) {
150152
});
151153
});
152154
tableInfo.columns = columnData;
155+
console.log(tableInfo);
153156
return sqlToModel(tableInfo);
154157
}
155158

0 commit comments

Comments
 (0)