diff --git a/LICENSE b/LICENSE index 9ac0c261..9c1d175d 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2013 - 2014 +Copyright (c) 2013 - 2015 All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/VERSION b/VERSION index e1c72ba8..988f30d1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -xorm v0.4.3.0403 +xorm v0.4.3.0428 diff --git a/doc.go b/doc.go index 722088ca..54ce2b98 100644 --- a/doc.go +++ b/doc.go @@ -1,4 +1,4 @@ -// Copyright 2013 - 2014 The XORM Authors. All rights reserved. +// Copyright 2013 - 2015 The Xorm Authors. All rights reserved. // Use of this source code is governed by a BSD // license that can be found in the LICENSE file. diff --git a/engine.go b/engine.go index 8f0c805d..5f652101 100644 --- a/engine.go +++ b/engine.go @@ -1,3 +1,7 @@ +// Copyright 2015 The Xorm Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + package xorm import ( diff --git a/error.go b/error.go index c868173f..61537a34 100644 --- a/error.go +++ b/error.go @@ -1,3 +1,7 @@ +// Copyright 2015 The Xorm Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + package xorm import ( diff --git a/goracle_driver.go b/goracle_driver.go index f24fe339..9fcde48f 100644 --- a/goracle_driver.go +++ b/goracle_driver.go @@ -1,3 +1,7 @@ +// Copyright 2015 The Xorm Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + package xorm import ( diff --git a/helpers.go b/helpers.go index 7eaa1dd1..5208137a 100644 --- a/helpers.go +++ b/helpers.go @@ -1,3 +1,7 @@ +// Copyright 2015 The Xorm Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + package xorm import ( diff --git a/logger.go b/logger.go index da3ba019..31787ba0 100644 --- a/logger.go +++ b/logger.go @@ -1,3 +1,7 @@ +// Copyright 2015 The Xorm Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + package xorm import ( diff --git a/lru_cacher.go b/lru_cacher.go index 8c912879..855cce2e 100644 --- a/lru_cacher.go +++ b/lru_cacher.go @@ -1,4 +1,7 @@ -//LRUCacher implements Cacher according to LRU algorithm +// Copyright 2015 The Xorm Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + package xorm import ( diff --git a/memroy_store.go b/memroy_store.go index c5800e46..60330995 100644 --- a/memroy_store.go +++ b/memroy_store.go @@ -1,4 +1,7 @@ -// MemoryStore implements CacheStore provide local machine +// Copyright 2015 The Xorm Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + package xorm import ( diff --git a/mssql_dialect.go b/mssql_dialect.go index e6f3c7b3..a910406b 100644 --- a/mssql_dialect.go +++ b/mssql_dialect.go @@ -1,3 +1,7 @@ +// Copyright 2015 The Xorm Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + package xorm import ( diff --git a/mymysql_driver.go b/mymysql_driver.go index a4e726a4..53094de9 100644 --- a/mymysql_driver.go +++ b/mymysql_driver.go @@ -1,3 +1,7 @@ +// Copyright 2015 The Xorm Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + package xorm import ( diff --git a/mysql_dialect.go b/mysql_dialect.go index 04767a5e..76a84a7f 100644 --- a/mysql_dialect.go +++ b/mysql_dialect.go @@ -1,3 +1,7 @@ +// Copyright 2015 The Xorm Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + package xorm import ( diff --git a/mysql_driver.go b/mysql_driver.go index c36fa8b6..872d854d 100644 --- a/mysql_driver.go +++ b/mysql_driver.go @@ -1,3 +1,7 @@ +// Copyright 2015 The Xorm Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + package xorm import ( diff --git a/oci8_driver.go b/oci8_driver.go index 5bb1d16c..f16a2a37 100644 --- a/oci8_driver.go +++ b/oci8_driver.go @@ -1,3 +1,7 @@ +// Copyright 2015 The Xorm Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + package xorm import ( diff --git a/odbc_driver.go b/odbc_driver.go index 0f6d4e18..81b87fde 100644 --- a/odbc_driver.go +++ b/odbc_driver.go @@ -1,3 +1,7 @@ +// Copyright 2015 The Xorm Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + package xorm import ( diff --git a/oracle_dialect.go b/oracle_dialect.go index 71d31977..b4f89edf 100644 --- a/oracle_dialect.go +++ b/oracle_dialect.go @@ -1,3 +1,7 @@ +// Copyright 2015 The Xorm Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + package xorm import ( diff --git a/postgres_dialect.go b/postgres_dialect.go index abe51c3e..04713cf5 100644 --- a/postgres_dialect.go +++ b/postgres_dialect.go @@ -1,3 +1,7 @@ +// Copyright 2015 The Xorm Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + package xorm import ( diff --git a/pq_driver.go b/pq_driver.go index c8dd5aa0..d86c97bb 100644 --- a/pq_driver.go +++ b/pq_driver.go @@ -1,3 +1,7 @@ +// Copyright 2015 The Xorm Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + package xorm import ( diff --git a/processors.go b/processors.go index 03ae8e0f..18071c1f 100644 --- a/processors.go +++ b/processors.go @@ -1,3 +1,7 @@ +// Copyright 2015 The Xorm Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + package xorm // Executed before an object is initially persisted to the database diff --git a/rows.go b/rows.go index 0def5575..2d3bbb85 100644 --- a/rows.go +++ b/rows.go @@ -1,3 +1,7 @@ +// Copyright 2015 The Xorm Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + package xorm import ( diff --git a/session.go b/session.go index 5fa1ebbe..34738b89 100644 --- a/session.go +++ b/session.go @@ -1,3 +1,7 @@ +// Copyright 2015 The Xorm Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + package xorm import ( @@ -722,7 +726,7 @@ func (session *Session) cacheGet(bean interface{}, sqlStr string, args ...interf func (session *Session) cacheFind(t reflect.Type, sqlStr string, rowsSlicePtr interface{}, args ...interface{}) (err error) { if session.Statement.RefTable == nil || indexNoCase(sqlStr, "having") != -1 || - indexNoCase(sqlStr, "group by") != -1 || + indexNoCase(sqlStr, "group by") != -1 || session.Tx != nil { return ErrCacheFailed } diff --git a/sqlite3_dialect.go b/sqlite3_dialect.go index 960d0b7b..8a770f78 100644 --- a/sqlite3_dialect.go +++ b/sqlite3_dialect.go @@ -1,3 +1,7 @@ +// Copyright 2015 The Xorm Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + package xorm import ( @@ -156,7 +160,7 @@ func (db *sqlite3) SqlType(c *core.Column) string { return core.DateTime case core.TimeStampz: return core.Text - case core.Char, core.Varchar, core.NVarchar, core.TinyText, + case core.Char, core.Varchar, core.NVarchar, core.TinyText, core.Text, core.MediumText, core.LongText, core.Json: return core.Text case core.Bit, core.TinyInt, core.SmallInt, core.MediumInt, core.Int, core.Integer, core.BigInt, core.Bool: diff --git a/sqlite3_driver.go b/sqlite3_driver.go index 2ecd9edf..6ae19569 100644 --- a/sqlite3_driver.go +++ b/sqlite3_driver.go @@ -1,3 +1,7 @@ +// Copyright 2015 The Xorm Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + package xorm import ( diff --git a/statement.go b/statement.go index b8f85971..c7ee11cf 100644 --- a/statement.go +++ b/statement.go @@ -1,3 +1,7 @@ +// Copyright 2015 The Xorm Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + package xorm import ( diff --git a/syslogger.go b/syslogger.go index 5c78fecb..eff69d11 100644 --- a/syslogger.go +++ b/syslogger.go @@ -1,3 +1,7 @@ +// Copyright 2015 The Xorm Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // +build !windows,!nacl,!plan9 package xorm diff --git a/xorm.go b/xorm.go index e67e342a..8b6cc568 100644 --- a/xorm.go +++ b/xorm.go @@ -1,3 +1,7 @@ +// Copyright 2015 The Xorm Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + package xorm import ( @@ -13,7 +17,7 @@ import ( ) const ( - Version string = "0.4.3.0403" + Version string = "0.4.3.0428" ) func regDrvsNDialects() bool {