Commit Graph

215 Commits

Author SHA1 Message Date
Lunny Xiao e9059acd4d Merge branch 'master' of github.com:go-xorm/xorm 2014-08-28 22:53:40 +08:00
Lunny Xiao 0fa2433cf9 improved Sync2 method 2014-08-28 22:48:01 +08:00
商讯在线 34e79e0d63 fix bugs https://github.com/go-xorm/cmd/issues/3
Signed-off-by: 商讯在线 <swhbox@foxmail.com>
2014-08-24 21:15:16 +08:00
Nash Tsai 49b33f3e22 Merge branch 'master' into feature/cacher-tag 2014-08-22 17:57:33 +08:00
Nash Tsai 64790ba262 fixed code error 2014-08-22 17:57:17 +08:00
Nash Tsai 48798e566f Merge remote-tracking branch 'origin/master' into feature/cacher-tag 2014-08-22 16:55:43 +08:00
Nash Tsai 01b89af2ce maintain backward compatibility on engine's logging settings 2014-08-22 16:39:59 +08:00
Nash Tsai 90d1be45a2 update ILogger interface, to reduce performance cost where string format or concat is done when it's need to write out 2014-08-20 10:37:52 +08:00
Nash Tsai 9ae84a13fc add TODO comments 2014-08-20 09:46:18 +08:00
Nash Tsai 0c227ead0f add log level support to simple logger 2014-08-20 09:38:52 +08:00
Nash Tsai 6958d6d3dc guard uninitialized time in func (engine *Engine) TZTime(t time.Time) 2014-08-19 10:38:57 +08:00
Nash Tsai 236970548e resolved merge 2014-08-11 20:02:14 +08:00
Nash Tsai f33ed5b947 fix error using ioutil.Discard 2014-08-11 20:00:13 +08:00
Lunny Xiao 4c38b4de47 add set type 2014-08-07 22:18:15 +08:00
Nash Tsai 40d500a8b9 add Engine.LogSQLQueryTime and Engine.LogSQLExecutionTime for SQL execution time logging 2014-07-21 14:56:26 +08:00
Nash Tsai 2b4273578a Merge remote-tracking branch 'origin/master' into feature/cacher-tag 2014-07-21 12:43:06 +08:00
Nash Tsai 6e37d48701 fixed missing engine.LogWarnf replacement 2014-07-21 12:05:07 +08:00
Nash Tsai 925d4e8ca5 add LogErrorf/LogWarnf/LogInfof/LogDebugf for formatter logging
using fmt.Sprint instead of fmt.Sprintln for logging print
2014-07-21 12:03:20 +08:00
Nash Tsai f20e1f7c0e Merge remote-tracking branch 'origin/master' into feature/cacher-tag 2014-07-21 11:30:05 +08:00
Lunny Xiao 4a03e015f4 bug fixed for log 2014-07-19 18:02:02 +08:00
kevinGunn f040283a1f add mothod Decr 2014-07-15 23:32:20 +08:00
kevinGunn 3c457a8cf0 add mothod Decr 2014-07-15 23:25:24 +08:00
wulove 6dd8bcfca0 Update engine.go
当数据库driver是https://github.com/denisenkom/go-mssqldb时,不对datetime类型进行时间截取,在go-mssqldb中会自动处理
2014-07-01 10:09:16 +08:00
Nash Tsai 2f121b9566 Merge remote-tracking branch 'origin/master' into feature/cacher-tag 2014-06-20 21:56:46 +08:00
Lunny Xiao 021ad08402 Merge branch 'bug' 2014-06-11 14:01:24 +08:00
Lunny Xiao 6d1a0ac0b0 add Sync2 for a new sync database struct methods 2014-06-11 14:01:14 +08:00
Lunny Xiao 23d0d656da ShowSQL bug fixed 2014-05-31 12:22:06 +08:00
Lunny Xiao 6384ada2bb bug fixed 2014-05-31 12:19:46 +08:00
Lunny Xiao bfeb6ea19f bug fixed & new Import func 2014-05-24 16:05:48 +08:00
Lunny Xiao e4f05916cb add support for Join 2014-05-23 14:18:45 +08:00
Nash Tsai f4f07ec079 #66 partial implement xorm_cache tag
add Engine.disableGlobalCache and explicit using cache via xorm_cache tag
2014-05-17 00:39:30 +08:00
Lunny Xiao 78ddfebcfb resolved #115 2014-05-09 21:53:00 +08:00
Lunny Xiao 4b94c7b784 add support for prt to extends struct & resolved #115 2014-05-08 13:25:43 +08:00
Lunny Xiao 2ebacae199 add part support for ql 2014-05-07 15:56:33 +08:00
Lunny Xiao caffa2447f bug fixed and improved IsTableExist 2014-05-06 14:59:58 +08:00
商讯在线 7bbbcba21b support enum type for mysql 2014-05-05 22:26:17 +08:00
Lunny Xiao 23ffb3d2a0 bug fixed for dump 2014-05-05 17:56:04 +08:00
Lunny Xiao 9e147d2fde add BeforeSet processor and Dump function 2014-05-04 13:53:38 +08:00
Lunny Xiao 685a4a63fd bug fixed and docs improved 2014-05-02 08:48:51 +08:00
Lunny Xiao 1a53dc40e1 add support for ql 2014-04-29 14:16:53 +08:00
Lunny Xiao 8c79a0cc1d new dialect interface 2014-04-23 14:01:04 +08:00
Nash Tsai a4d3be797f Revert "update"
This reverts commit a25f371cbf.
2014-04-22 18:51:56 +08:00
商讯在线 a25f371cbf update
Signed-off-by: 商讯在线 <swhbox@foxmail.com>
2014-04-21 23:07:37 +08:00
Nash Tsai 0a22f9c018 resolved merge 2014-04-19 00:44:14 +08:00
Lunny Xiao 82e73d6002 bug fixed for Incr 2014-04-18 22:14:15 +08:00
Nash Tsai 783e905649 Merge remote-tracking branch 'origin/dev' 2014-04-18 16:42:05 +08:00
Lunny Xiao 0d9c1a02eb add back SetMaxConns for compitable and set @deprecated 2014-04-18 10:52:33 +08:00
Nash Tsai 3ef0b27d4a resolved merge from origin/dev 2014-04-17 23:25:50 +08:00
Nash Tsai b7690b1668 use time.Location struct instead of TimeZone string 2014-04-17 23:21:42 +08:00
Nash Tsai 52f7a96bfe resolved merge from origin/dev branch 2014-04-17 21:28:26 +08:00
Lunny Xiao 05e99e39c6 bug fixed 2014-04-17 10:13:16 +08:00
商讯在线 a4876ffec2 update
Signed-off-by: 商讯在线 <swhbox@foxmail.com>
2014-04-16 20:56:04 +08:00
商讯在线 e8c0ff31b3 update
Signed-off-by: 商讯在线 <swhbox@foxmail.com>
2014-04-16 20:08:53 +08:00
商讯在线 aa9b62f275 update
Signed-off-by: 商讯在线 <swhbox@foxmail.com>
2014-04-15 23:27:08 +08:00
Nash Tsai 145358a74e update API comments 2014-04-15 14:37:10 +08:00
Lunny Xiao 9a7a6cd4d2 move Inc() to Incr() 2014-04-15 12:14:18 +08:00
Lunny Xiao 1161484c92 Merge branch 'dev' of https://github.com/unphp/xorm into unphp-dev 2014-04-15 11:46:43 +08:00
Lunny Xiao feb1f45e72 Added NewDB(), DB(), Clone() and removed pool object and other improvements 2014-04-15 11:39:29 +08:00
unphp e2aa0ef2c2 Method In provides a update string 2014-04-15 10:55:32 +08:00
unphp decbeefc27 Method In provides a update string 2014-04-15 10:55:19 +08:00
unphp 97f4b0e45c Method In provides a update string 2014-04-15 10:55:14 +08:00
商讯在线 ad33a0be49 bug fixed
Signed-off-by: 商讯在线 <swhbox@foxmail.com>
2014-04-13 12:22:32 +08:00
商讯在线 855c53337a bug fixed
Signed-off-by: 商讯在线 <swhbox@foxmail.com>
2014-04-13 10:21:29 +08:00
Lunny Xiao 128db9c792 bug fixed and tests passed 2014-04-11 17:04:39 +08:00
Lunny Xiao 5080b2b571 Merge branch 'master' into dev
Conflicts:
	dialects/oracle.go
	dialects/postgres.go
	docs/QuickStart.md
	engine.go
	mysql.go
	session.go
	statement.go
	table.go
	tests/base_test.go
	xorm.go
	xorm/go.go
	xorm/reverse.go
2014-04-11 15:37:27 +08:00
Lunny Xiao 9b23e7d6c0 resolved #89: if struct has func, the struct's name is the result 2014-04-08 16:46:23 +08:00
Lunny Xiao 9d5f834eb2 bug fixed & add MustCols function & improved docs 2014-04-06 12:58:16 +08:00
Lunny Xiao 6e7cead1ec remove debug info 2014-04-05 22:18:25 +08:00
Lunny Xiao 9d64ef5013 bug fixed 2014-04-05 22:14:00 +08:00
Lunny Xiao ff3a06b3dc ql support 2014-03-28 15:03:35 +08:00
Nash Tsai 4f6106e168 private Engine.LogSQL and create ILogger interface that is compatible with log/syslog package. Also fixed use of LogError instead of LogSQL 2014-02-12 01:35:26 +08:00
商讯在线 d0567a63b4 补遗
Signed-off-by: 商讯在线 <swhbox@foxmail.com>
2014-02-11 21:42:14 +08:00
Lunny Xiao b66e7aa067 use core.DB instead of sql.DB 2014-02-11 14:59:04 +08:00
Lunny Xiao a76d74804f a little performance improved 2014-02-10 15:36:25 +08:00
Lunny Xiao da96e0cc86 a little perfomance improved 2014-02-10 13:56:29 +08:00
S.W.H fc0372f6bc Merge pull request #2 from admpub/master
更新到最新版
2014-01-29 21:27:19 -08:00
商讯在线 46fe2ce87e 一、xorm反转工具bug修复:
1、xorm反转工具增加表前缀支持;
2、修正decimal(5, 2)类型中括号内出现空格导致解析出错的bug;
3、修正xorm解析工具在windows环境下,指定生成路径时model名获取不正确的bug
二、xorm对于数据字段类型为文本类型默认值为空白字符的情况下,生成的struct中default信息丢失的bug,已修正。

Signed-off-by: 商讯在线 <swhbox@foxmail.com>
2014-01-30 13:10:15 +08:00
S.W.H d4f8196920 fixbug: parse DECIMAL(10, 2) failure. 2014-01-27 21:28:13 +08:00
S.W.H 9e267ad5c3 fixbug: parse DECIMAL(10, 2) failure. 2014-01-27 21:25:49 +08:00
Lunny Xiao 56700ee336 bug fixed 2014-01-25 10:31:07 +08:00
Lunny Xiao e77fca31ae move tests to tests subdir & refactoring 2014-01-25 10:07:11 +08:00
Lunny Xiao 21c08ea09c move test files to tests/ subdir 2014-01-23 11:09:48 +08:00
Lunny Xiao d71a6af18a autoincr(start) support 2014-01-23 10:19:18 +08:00
Lunny Xiao 346681289d bug fixed #51 2014-01-16 23:03:56 +08:00
Lunny Xiao 65edc742b4 merge dialect 2014-01-09 14:44:41 +08:00
Nash Tsai 07b2d15a26 code tidy up, minor performance improvement 2014-01-08 18:37:22 +08:00
Lunny Xiao 4df43ffa0f new architecture 2014-01-07 17:33:27 +08:00
Lunny Xiao 2c1722ff1d resolved #36 2013-12-31 12:22:36 +08:00
lunny 7d02fc2e35 Merge pull request #39 from nashtsai/master
make Import() call Db.Exec() directly
2013-12-26 16:51:44 -08:00
Nash Tsai 0dd3951636 make Import() call Db.Exec() directly 2013-12-26 18:31:04 +08:00
lunny 17d74617ea Merge pull request #37 from nashtsai/scrolling-rs
Scrolling rs
2013-12-25 23:12:08 -08:00
Nash Tsai 6269596915 update API comments 2013-12-26 14:53:20 +08:00
Nash Tsai 6bc64c8fe6 change Iterator struct naming to 'Rows' and making compatible interface to sql.Rows 2013-12-26 14:50:44 +08:00
Nash Tsai 6aa911aae0 comment Iterator public methods 2013-12-25 23:35:34 +08:00
Lunny Xiao 901d7b6670 bug fixed 2013-12-25 17:41:01 +08:00
Nash Tsai 275205e6f1 implemented forward scrolling resultset and updated Session.Iterator() implementation 2013-12-25 15:39:56 +08:00
Lunny Xiao d5a4324585 add support to int32, int, uint, uint32, uint64 for pk 2013-12-24 18:18:48 +08:00
Lunny Xiao 97a2494984 id bug fixed 2013-12-20 16:31:26 +08:00
lunny b778bfce82 merge mssql support 2013-12-20 15:11:56 +08:00
lunny 4459c88a28 add mssql support 2013-12-20 14:53:40 +08:00