33 Commits

Author	SHA1	Message	Date
jianzhiyao	139c393f08	add const ErrLastInsertIdUnavailable	2020-08-14 09:59:11 +08:00
jianzhiyao	7ce0fde171	fix:return error when calling `InsertOrUpdate` is successful with string primary key	2020-08-13 19:14:00 +08: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
Ming Deng	82178a487b	Merge develop-2.0 and resolve conflict	2020-08-11 08:16:04 +00: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	dec98f004c	Support opentracing filter for Orm	2020-08-09 14:59:41 +00:00
Ming Deng	7fc1e4de96	Merge pull request #4141 from flycash/ftr/ormInterceptor ... Orm filter support	2020-08-08 20:52:37 +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	2f5683610f	Minor grammar fixes	2020-08-05 17:50:05 +01: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	30eb889a91	Format code	2020-07-22 23:00:06 +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