Skip to content

Commit a56a202

Browse files
committed
support database postgresql and tidb
1 parent 948b3f0 commit a56a202

File tree

83 files changed

+2050
-725
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+2050
-725
lines changed

.github/RELEASE.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
## Change log
22

3-
- Add auto test scripts.
4-
- Repack gorm package.
3+
- Added generate database initialization code command.
4+
- Added support for postgresql, tidb generation code.
5+
- Modify the Sponge UI interface.
6+
- Adjust database configuration in configuration.
7+
- Added generate k8s configmap script command.
8+
- The generated code version matches the local sponge version.

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ image-build-rpc-test:
169169

170170

171171
.PHONY: patch
172-
# patch some dependent code, such as types.proto, mysql initialization code. e.g. make patch TYPE=types-pb , make patch TYPE=mysql-init
172+
# patch some dependent code, such as types.proto, mysql initialization code. e.g. make patch TYPE=types-pb , make patch TYPE=init-mysql, make patch TYPE=init-postgresql
173173
patch:
174174
@bash scripts/patch.sh $(TYPE)
175175

api/serverNameExample/v1/userExample.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ message ListUserExampleByIDsReply {
301301

302302
message ListUserExampleByLastIDRequest {
303303
uint64 lastID = 1 [(tagger.tags) = "form:\"lastID\""]; // last id
304-
uint32 limit = 2 [(validate.rules).uint32.gt = 0, (tagger.tags) = "form:\"limit\""]; // page size
304+
uint32 limit = 2 [(validate.rules).uint32.gt = 0, (tagger.tags) = "form:\"limit\""]; // limit size per page
305305
string sort = 3 [(tagger.tags) = "form:\"sort\""]; // sort by column name of table, default is -id, the - sign indicates descending order.
306306
}
307307

cmd/serverNameExample_grpcExample/initial/close.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ func Close(servers []app.IServer) []app.Close {
2020
closes = append(closes, s.Stop)
2121
}
2222

23-
// close mysql
23+
// close database
2424
closes = append(closes, func() error {
25-
return model.CloseMysql()
25+
return model.CloseDB()
2626
})
2727

2828
// close redis

cmd/serverNameExample_grpcExample/initial/initApp.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ func InitApp() {
4545
logger.Info("init logger succeeded")
4646

4747
// initializing database
48-
model.InitMysql()
49-
logger.Info("init mysql succeeded")
48+
model.InitDB()
49+
logger.Infof("init %s succeeded", cfg.Database.Driver)
5050
model.InitCache(cfg.App.CacheType)
5151

5252
// initializing tracing

cmd/serverNameExample_grpcPbExample/initial/close.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ func Close(servers []app.IServer) []app.Close {
2020
closes = append(closes, s.Stop)
2121
}
2222

23-
// close mysql
23+
// close database
2424
//closes = append(closes, func() error {
25-
// return model.CloseMysql()
25+
// return model.CloseDB()
2626
//})
2727

2828
// close redis

cmd/serverNameExample_grpcPbExample/initial/initApp.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ func InitApp() {
4646
logger.Info("init logger succeeded")
4747

4848
// initializing database
49-
//model.InitMysql()
50-
//logger.Info("init mysql succeeded")
49+
//model.InitDB()
50+
//logger.Infof("init %s succeeded", cfg.Database.Driver)
5151
//model.InitCache(cfg.App.CacheType)
5252

5353
// initializing tracing

cmd/serverNameExample_httpExample/initial/close.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ func Close(servers []app.IServer) []app.Close {
2020
closes = append(closes, s.Stop)
2121
}
2222

23-
// close mysql
23+
// close database
2424
closes = append(closes, func() error {
25-
return model.CloseMysql()
25+
return model.CloseDB()
2626
})
2727

2828
// close redis

cmd/serverNameExample_httpExample/initial/initApp.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ func InitApp() {
4545
logger.Info("init logger succeeded")
4646

4747
// initializing database
48-
model.InitMysql()
49-
logger.Info("init mysql succeeded")
48+
model.InitDB()
49+
logger.Infof("init %s succeeded", cfg.Database.Driver)
5050
model.InitCache(cfg.App.CacheType)
5151

5252
// initializing tracing

cmd/serverNameExample_httpPbExample/initial/close.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ func Close(servers []app.IServer) []app.Close {
2020
closes = append(closes, s.Stop)
2121
}
2222

23-
// close mysql
23+
// close database
2424
//closes = append(closes, func() error {
25-
// return model.CloseMysql()
25+
// return model.CloseDB()
2626
//})
2727

2828
// close redis

0 commit comments

Comments
 (0)