18 Commits

Author	SHA1	Message	Date
Ming Deng	94f476fa39	Merge pull request #4158 from jianzhiyao/frt/fix_spk_upsert ... fix:return error when calling ``InsertOrUpdate`` is successful with string primary key	2020-08-16 21:21:25 +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
jianzhiyao	739b8bab0c	fix UT	2020-08-14 10:31:08 +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	08cec9178f	Orm filter support	2020-08-07 13:45:24 +00:00
Ming Deng	54ef476600	add tag interfaces and remove log.go	2020-07-28 06:28:51 +00:00
jianzhiyao	b6f7d30f9f	fix unit test	2020-07-20 19:10:57 +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