Merge remote-tracking branch 'upstream/master' into dev

README.md

@@ -41,14 +41,21 @@ Drivers for Go's sql package which currently support database/sql includes:
 
 # Changelog
 
-* **v0.2.3** : Improved documents; Optimistic Locking support; Timestamp with time zone support; Mapper change to tableMapper and columnMapper & added PrefixMapper & SuffixMapper support custom table or column name's prefix and suffix;Insert now return affected, err instead of id, err; Added UseBool & Distinct;
+* **v0.3.1** 
-* **v0.2.2** : Postgres drivers now support lib/pq; Added method Iterate for record by record to handler；Added SetMaxConns(go1.2+) support; some bugs fixed.
+
-* **v0.2.1** : Added database reverse tool, now support generate go & c++ codes, see [Xorm Tool README](https://github.com/lunny/xorm/blob/master/xorm/README.md); some bug fixed.
+	Features:
-* **v0.2.0** : Added Cache supported, select is speeder up 3~5x; Added SameMapper for same name between struct and table; Added Sync method for auto added tables, columns, indexes;
+	* Support MSSQL DB via ODBC driver ([github.com/lunny/godbc](https://github.com/lunny/godbc));
+	* Composite Key, using multiple pk xorm tag 
+	* Added Row() API as alternative to Iterate() API for traversing result set, provide similar usages to sql.Rows type
+	* ORM struct allowed declaration of pointer builtin type as members to allow null DB fields 
+	* Before and After Event processors
+
+	Improvements:
+	* Allowed int/int32/int64/uint/uint32/uint64/string as Primary Key type
+	* Performance improvement for Get()/Find()/Iterate()
 
 [More changelogs ...](https://github.com/lunny/xorm/blob/master/docs/Changelog.md)
 
-
 # Installation
 
 If you have [gopm](https://github.com/gpmgo/gopm) installed, 

README_CN.md

@@ -41,10 +41,20 @@ xorm是一个简单而强大的Go语言ORM库. 通过它可以使数据库操作
 * MsSql: [github.com/lunny/godbc](https://github.com/lunny/godbc)
 
 ## 更新日志
-* **v0.2.3** : 改善了文档；提供了乐观锁支持；添加了带时区时间字段支持；Mapper现在分成表名Mapper和字段名Mapper，同时实现了表或字段的自定义前缀后缀；Insert方法的返回值含义从id, err更改为 affected, err，请大家注意；添加了UseBool 和 Distinct函数。
+
-* **v0.2.2** : Postgres驱动新增了对lib/pq的支持；新增了逐条遍历方法Iterate；新增了SetMaxConns(go1.2+)支持，修复了bug若干；
+* **v0.3.1**
-* **v0.2.1** : 新增数据库反转工具，当前支持go和c++代码的生成，详见 [Xorm Tool README](https://github.com/lunny/xorm/blob/master/xorm/README.md); 修复了一些bug.
+
-* **v0.2.0** : 新增 [缓存](https://github.com/lunny/xorm/blob/master/docs/QuickStart.md#120)支持，查询速度提升3-5倍； 新增数据库表和Struct同名的映射方式； 新增Sync同步表结构；
+	新特性:
+	* 支持 MSSQL DB 通过 ODBC 驱动 ([github.com/lunny/godbc](https://github.com/lunny/godbc));
+	* 通过多个pk标记支持联合主键; 
+	* 新增 Rows() API 用来遍历查询结果，该函数提供了类似sql.Rows的相似用法，可作为 Iterate() API 的可选替代；
+	* ORM 结构体现在允许内建类型的指针作为成员，使得数据库为null成为可能；
+	* Before 和 After 支持
+
+	改进:
+	* 允许 int/int32/int64/uint/uint32/uint64/string 作为主键类型
+	* 查询函数 Get()/Find()/Iterate() 在性能上的改进
+
 
 [更多更新日志...](https://github.com/lunny/xorm/blob/master/docs/ChangelogCN.md)
 

VERSION

@@ -1 +1 @@
-xorm v0.2.3 
+xorm v0.3.1 

docs/Changelog.md

@@ -1,5 +1,19 @@
 ## Changelog
 
+* **v0.3.1** 
+
+	Features:
+	* Support MSSQL DB via ODBC driver ([github.com/lunny/godbc](https://github.com/lunny/godbc));
+	* Composite Key, using multiple pk xorm tag 
+	* Added Row() API as alternative to Iterate() API for traversing result set, provide similar usages to sql.Rows type
+	* ORM struct allowed declaration of pointer builtin type as members to allow null DB fields 
+	* Before and After Event processors
+
+	Improvements:
+	* Allowed int/int32/int64/uint/uint32/uint64/string as Primary Key type
+	* Performance improvement for Get()/Find()/Iterate()
+
+
 * **v0.2.3** : Improved documents; Optimistic Locking support; Timestamp with time zone support; Mapper change to tableMapper and columnMapper & added PrefixMapper & SuffixMapper support custom table or column name's prefix and suffix;Insert now return affected, err instead of id, err; Added UseBool & Distinct;
 * **v0.2.2** : Postgres drivers now support lib/pq; Added method Iterate for record by record to handler；Added SetMaxConns(go1.2+) support; some bugs fixed.
 * **v0.2.1** : Added database reverse tool, now support generate go & c++ codes, see [Xorm Tool README](https://github.com/lunny/xorm/blob/master/xorm/README.md); some bug fixed.

docs/ChangelogCN.md

@@ -1,5 +1,18 @@
 ## 更新日志
 
+* **v0.3.1**
+
+	新特性:
+	* 支持 MSSQL DB 通过 ODBC 驱动 ([github.com/lunny/godbc](https://github.com/lunny/godbc));
+	* 通过多个pk标记支持联合主键; 
+	* 新增 Rows() API 用来遍历查询结果，该函数提供了类似sql.Rows的相似用法，可作为 Iterate() API 的可选替代；
+	* ORM 结构体现在允许内建类型的指针作为成员，使得数据库为null成为可能；
+	* Before 和 After 支持
+
+	改进:
+	* 允许 int/int32/int64/uint/uint32/uint64/string 作为主键类型
+	* 查询函数 Get()/Find()/Iterate() 在性能上的改进
+
 * **v0.2.3** : 改善了文档；提供了乐观锁支持；添加了带时区时间字段支持；Mapper现在分成表名Mapper和字段名Mapper，同时实现了表或字段的自定义前缀后缀；Insert方法的返回值含义从id, err更改为 affected, err，请大家注意；添加了UseBool 和 Distinct函数。
 * **v0.2.2** : Postgres驱动新增了对lib/pq的支持；新增了逐条遍历方法Iterate；新增了SetMaxConns(go1.2+)支持，修复了bug若干；
 * **v0.2.1** : 新增数据库反转工具，当前支持go和c++代码的生成，详见 [Xorm Tool README](https://github.com/lunny/xorm/blob/master/xorm/README.md); 修复了一些bug.

xorm.go

@@ -10,7 +10,7 @@ import (
 )
 
 const (
-	Version string = "0.2.3"
+	Version string = "0.3.1"
 )
 
 func close(engine *Engine) {