1
0
mirror of https://github.com/astaxie/beego.git synced 2024-11-15 04:40:54 +00:00
Commit Graph

165 Commits

Author SHA1 Message Date
Ming Deng
8574e30b3a
Merge pull request #4160 from AllenX2018/Improve-orm.Fielder-function
fix issue #3776
2020-08-14 22:20:07 +08:00
AllenX2018
7442919f5a fix issue #3776 2020-08-14 17:11:52 +08:00
jianzhiyao
7b899aa9af add ErrLastInsertIdUnavailable 2020-08-14 15:09:47 +08:00
Ming Deng
f73eee75ff Merge develop-2.0 2020-08-14 14:34:59 +08:00
jianzhiyao
739b8bab0c fix UT 2020-08-14 10:31:08 +08:00
jianzhiyao
139c393f08 add const ErrLastInsertIdUnavailable 2020-08-14 09:59:11 +08:00
Ming Deng
bdec93986b Bean: Support autowire by tag
Orm: Support default value filter
2020-08-13 21:26:39 +08:00
jianzhiyao
7ce0fde171 fix:return error when calling `InsertOrUpdate` is successful with string primary key 2020-08-13 19:14:00 +08:00
Ming Deng
d6a2621b3c
Merge pull request #4137 from phiphi282/change_redis_provider
Add additional options to redis session prov
2020-08-12 13:38:44 +08:00
Phillip Stagnet
813a4df3c5
Make sure expiry time is in seconds 2020-08-11 16:21:43 +02:00
Phillip Stagnet
7267f5e573
Add new config option into provider struct 2020-08-11 16:09:29 +02:00
jianzhiyao
2d1c02e1c1 Merge branch 'develop-2.0' of https://github.com/astaxie/beego into frt/fix_3830
# Conflicts:
#	pkg/orm/orm_test.go
2020-08-11 17:37:24 +08:00
jianzhiyao
9ca9535c48 fix:return error after inserting data when primary key is string 2020-08-11 16:53:31 +08:00
Phillip Stagnet
d1d9df74c7
Merge branch 'develop-2.0' of github.com:astaxie/beego into change_redis_provider 2020-08-11 10:47:06 +02:00
Ming Deng
82178a487b Merge develop-2.0 and resolve conflict 2020-08-11 08:16:04 +00:00
Phillip Stagnet
0813471202
Merge branch 'develop-2.0' of github.com:astaxie/beego into change_redis_provider 2020-08-11 09:52:53 +02:00
jianzhiyao
ce698aacf6 rm some methods 2020-08-11 12:06:02 +08:00
Ming Deng
c22af4c611 Fix Tracing and prometheus bug 2020-08-11 03:23:38 +00:00
Anker Jam
f8c0e6fec5 fix UT 2020-08-11 00:06:36 +08:00
Anker Jam
882f1273c8 add UT for specifying indexes 2020-08-10 23:27:03 +08:00
jianzhiyao
5a1fa4e1ec specify index 2020-08-10 18:46:16 +08:00
Ming Deng
75107f735e Support opentracing filter 2020-08-09 14:59:41 +00:00
Ming Deng
2e891152dd deprecated httplib and then support prometheus for httplib 2020-08-09 14:59:41 +00:00
Ming Deng
dec98f004c Support opentracing filter for Orm 2020-08-09 14:59:41 +00:00
Ming Deng
26b016a3a4
Merge pull request #4143 from flycash/fix/moveIni
Move init so it will be default implementation of config
2020-08-09 22:51:47 +08:00
Ming Deng
19aae0b7e1
Merge pull request #4107 from AllenX2018/fix-comment-router-issue
add comment router path configuration
2020-08-09 19:23:05 +08:00
Ming Deng
f9a3eae9d5 Move init so it will be default implementation of config 2020-08-08 13:17:49 +00:00
Ming Deng
7fc1e4de96
Merge pull request #4141 from flycash/ftr/ormInterceptor
Orm filter support
2020-08-08 20:52:37 +08:00
AllenX2018
993ccac2bd fix comment router generate issue 2020-08-08 16:17:12 +08:00
Ming Deng
2fd65a469c Support prometheus 2020-08-07 14:14:07 +00:00
Ming Deng
08cec9178f Orm filter support 2020-08-07 13:45:24 +00:00
IamCathal
63b3fc4a99 Fix retry amount comment 2020-08-06 16:09:06 +01:00
IamCathal
1b4bb43df0 More minor grammar fixes 2020-08-06 16:07:18 +01:00
Phillip Stagnet
ec55edfbc4
Add additional options to redis session prov
Adding option for frequency of checking timed out connections as well as
an option to specify retries.

These changes make redis provider more stable since connection problems
are becoming fewer.

Since redigo does not have this options and since redis_sentinel and
redis_cluster are using go-redis as a client, this commit changes from
redigo to go-redis for redis session provider.

Added tests for redis session provider as well.
2020-08-06 11:14:36 +02:00
Ming Deng
2fce8f9d1b
Merge pull request #4124 from phiphi282/session_exists_return_err
Update session provider interface to return errors on SessionExist
2020-08-06 09:17:49 +08:00
IamCathal
e7d8bab5d9 Improved definition of DefaultEvery 2020-08-05 17:56:11 +01:00
IamCathal
2f5683610f Minor grammar fixes 2020-08-05 17:50:05 +01:00
Phillip Stagnet
009074725e
Move interface change to pkg/session/README.md 2020-08-05 18:32:33 +02:00
Phillip Stagnet
ce50ca22d7
Merge branch 'develop-2.0' of github.com:astaxie/beego into session_exists_return_err 2020-08-05 18:30:19 +02:00
Phillip Stagnet
5f2f6e4f86
Add interface change in pkg folder 2020-08-05 18:29:22 +02:00
Ming Deng
261b704d8b Fix UT 2020-08-05 07:25:34 +00:00
Ming Deng
6c6cf91741 Support prometheus and opentracing filter 2020-08-04 23:15:42 +08:00
Ming Deng
aa3987f816 Merge remote-tracking branch 'origin/develop' into ftr/middleware 2020-08-04 22:26:01 +08:00
Ming Deng
79ffef90e3 support filter chain 2020-08-04 07:26:51 +00:00
Ming Deng
9f295067b7 Resolve conflict 2020-07-30 22:44:44 +08:00
Ming Deng
aa06a10493 uing pkg module 2020-07-29 14:42:27 +00:00
Ming Deng
9b58c2836c Merge develop-2.0 and resolve confilct 2020-07-29 22:26:29 +08:00
jianzhiyao
e87de70c6d adapt wrapping kv 2020-07-29 00:45:41 +08:00
jianzhiyao
4304b40a82 Merge branch 'frt/wrap_kv' into frt/stmt_config
# Conflicts:
#	pkg/orm/constant.go
#	pkg/orm/db_alias.go
2020-07-28 18:32:24 +08:00
jianzhiyao
e8facd28f5 wrap kv 2020-07-28 17:37:36 +08:00
Ming Deng
54ef476600 add tag interfaces and remove log.go 2020-07-28 06:28:51 +00:00
jianzhiyao
756df9385f make stmt cache size configurable 2020-07-28 12:57:19 +08:00
Ming Deng
21f281655d remove QueryRelated and QueryRelatedCtx 2020-07-27 21:22:40 +08:00
Ming Deng
2e7fb81348 deprecated orm.go and add NewOrmUsingDB method 2020-07-27 21:19:34 +08:00
jianzhiyao
16d71893cd orm.rawPrepare support FlatParams 2020-07-26 19:40:13 +08:00
Ming Deng
79c2157ad4 Fix UT 2020-07-22 15:46:29 +00:00
Ming Deng
30eb889a91 Format code 2020-07-22 23:00:06 +08:00
Ming Deng
9c51952db4 Move package 2020-07-22 22:55:59 +08:00
Ming Deng
44460bc457 Refactor RegisterDatabase 2020-07-20 15:52:40 +00:00
jianzhiyao
b6f7d30f9f fix unit test 2020-07-20 19:10:57 +08:00
jianzhiyao
4aad313de7 do not judge tx status in txOrm 2020-07-20 17:34:58 +08:00
jianzhiyao
aefe21b63a complete error log 2020-07-20 17:25:27 +08:00
jianzhiyao
32da446eb1 refactor orm 2020-07-19 23:46:42 +08:00
Ming Deng
192a278a2a Fix orm test when using Driver = mysql 2020-07-19 12:56:58 +00:00
Ming Deng
ffe1d52120 Move orm to pkg/orm 2020-07-15 10:05:11 +08:00