Commit Graph

1547 Commits

Author SHA1 Message Date
Andrew Thornton e9a66ac1ad
Merge branch 'master' into dump-infer-from-type 2021-04-20 17:49:37 +01:00
Andrew Thornton d64cf2f2d2
use session for import
Signed-off-by: Andrew Thornton <art27@cantab.net>
2021-04-12 19:39:23 +01:00
Andrew Thornton efebf2525f
remove fprintf
Signed-off-by: Andrew Thornton <art27@cantab.net>
2021-04-12 15:35:21 +01:00
Andrew Thornton 3a1b5ce682
tidb also needs parseTime too
Signed-off-by: Andrew Thornton <art27@cantab.net>
2021-04-12 15:21:03 +01:00
Andrew Thornton 4322c59c4f
better
Signed-off-by: Andrew Thornton <art27@cantab.net>
2021-04-12 12:55:39 +01:00
Andrew Thornton de0cf1c553
Handle bools in MSSQL
Signed-off-by: Andrew Thornton <art27@cantab.net>
2021-04-12 12:43:47 +01:00
Lunny Xiao ce2a743e88 Fix comments (#1896)
Reviewed-on: https://gitea.com/xorm/xorm/pulls/1896
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-committed-by: Lunny Xiao <xiaolunwen@gmail.com>
2021-04-12 16:00:07 +08:00
Lunny Xiao bd9535d781 Fix comments (#1893)
Reviewed-on: https://gitea.com/xorm/xorm/pulls/1893
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-committed-by: Lunny Xiao <xiaolunwen@gmail.com>
2021-04-12 09:19:08 +08:00
Andrew Thornton 4deb11051f
Merge branch 'dump-infer-from-type' of gitea.com:zeripath/xorm into dump-infer-from-type 2021-04-11 22:03:02 +01:00
Andrew Thornton fed511cc66
set parseTime=true
Signed-off-by: Andrew Thornton <art27@cantab.net>
2021-04-11 22:02:49 +01:00
Lunny Xiao 6689bead30 Merge branch 'master' into dump-infer-from-type 2021-04-12 00:29:22 +08:00
Lunny Xiao 1ade49614b More tests (#1890)
replace #1585

Reviewed-on: https://gitea.com/xorm/xorm/pulls/1890
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-committed-by: Lunny Xiao <xiaolunwen@gmail.com>
2021-04-11 23:41:20 +08:00
Lunny Xiao 0d479de2a0 Merge branch 'master' into dump-infer-from-type 2021-04-11 16:47:30 +08:00
Lunny Xiao 60cc3eaaf0 Unsigned Support (#1889)
This PR add support to MySQL, for other databases unsigned type will be downgrade to the related signed type.

Replace #1810

Reviewed-on: https://gitea.com/xorm/xorm/pulls/1889
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-committed-by: Lunny Xiao <xiaolunwen@gmail.com>
2021-04-11 16:47:04 +08:00
Lunny Xiao 2e53ce7454 Merge branch 'master' into dump-infer-from-type 2021-04-10 13:06:56 +08:00
Lunny Xiao 4bfe6853f5 Fix some comments lint and bug (#1888)
Reviewed-on: https://gitea.com/xorm/xorm/pulls/1888
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-committed-by: Lunny Xiao <xiaolunwen@gmail.com>
2021-04-10 10:57:36 +08:00
Lunny Xiao b92d951eac Fix drone (#1842)
Reviewed-on: https://gitea.com/xorm/xorm/pulls/1842
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-committed-by: Lunny Xiao <xiaolunwen@gmail.com>
2021-04-10 09:45:18 +08:00
Lunny Xiao ee78664413 Fix sqlite test (#1887)
Fix bug

Reviewed-on: https://gitea.com/xorm/xorm/pulls/1887
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-committed-by: Lunny Xiao <xiaolunwen@gmail.com>
2021-04-08 21:26:21 +08:00
Andrew Thornton 2142e31d95 Fix formatting (#1886)
Fix newline formatting

Signed-off-by: Andrew Thornton <art27@cantab.net>

Reviewed-on: https://gitea.com/xorm/xorm/pulls/1886
Co-authored-by: Andrew Thornton <art27@cantab.net>
Co-committed-by: Andrew Thornton <art27@cantab.net>
2021-04-08 20:51:48 +08:00
Andrew Thornton 3d4da2bea2 Merge branch 'master' into dump-infer-from-type 2021-04-08 18:20:33 +08:00
Andrew Thornton 21881d8b84 MariaDB 10.5 adds a suffix on old datatypes (#1885)
MariaDB when encountering an old datetime type will add a suffix of /* mariadb-5.3 */
on its schema information page. Xorm does not understand this and then its mappings
fail.

The simplest solution is just to remove any fixed suffix and that is what this PR does
- a clever solution would look for and remove any comments or match them.

See https://mariadb.com/kb/en/time/ for more details about the comment.

Related: https://github.com/go-gitea/gitea/issues/15277

Signed-off-by: Andrew Thornton <art27@cantab.net>

Reviewed-on: https://gitea.com/xorm/xorm/pulls/1885
Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: Andrew Thornton <art27@cantab.net>
Co-committed-by: Andrew Thornton <art27@cantab.net>
2021-04-08 14:12:40 +08:00
Andrew Thornton aff1ae8d3f
Merge branch 'dump-infer-from-type' of gitea.com:zeripath/xorm into dump-infer-from-type 2021-04-07 17:33:50 +01:00
Andrew Thornton 3ff3839b59
fix test bug
Signed-off-by: Andrew Thornton <art27@cantab.net>
2021-04-07 17:32:40 +01:00
Andrew Thornton d1be010b1d Merge branch 'master' into dump-infer-from-type 2021-04-08 00:14:08 +08:00
Lunny Xiao 40ee326cac More clear for Get with nil (#1879)
Resolve #1844

Reviewed-on: https://gitea.com/xorm/xorm/pulls/1879
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-committed-by: Lunny Xiao <xiaolunwen@gmail.com>
2021-03-23 21:48:58 +08:00
Lunny Xiao 9286f29576 Fix bug on import when split SQLs (#1878)
Fix #1876

Reviewed-on: https://gitea.com/xorm/xorm/pulls/1878
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-committed-by: Lunny Xiao <xiaolunwen@gmail.com>
2021-03-23 21:34:42 +08:00
Lunny Xiao e660414278 Support modernc.org/sqlite (#1850)
Reviewed-on: https://gitea.com/xorm/xorm/pulls/1850
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-committed-by: Lunny Xiao <xiaolunwen@gmail.com>
2021-03-15 23:34:33 +08:00
4color a7a51533d1 fix oracle insert datetime (#1873)
oracle下的日期插入问题。

Reviewed-on: https://gitea.com/xorm/xorm/pulls/1873
Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: 4color <4color@noreply.gitea.io>
Co-committed-by: 4color <4color@noreply.gitea.io>
2021-03-04 23:40:35 +08:00
Andrew Thornton 6d1aba4e23
Use provided type to create the dstTable rather than inferring from the SQL types
Signed-off-by: Andrew Thornton <art27@cantab.net>
2021-02-28 16:08:57 +00:00
clannadxr eed7e65bd9 Panic when setting wrong logger (#1868)
Co-authored-by: clannadxr <clannadxr@hotmail.com>
Reviewed-on: https://gitea.com/xorm/xorm/pulls/1868
Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: clannadxr <clannadxr@noreply.gitea.io>
Co-committed-by: clannadxr <clannadxr@noreply.gitea.io>
2021-02-18 17:14:13 +08:00
clannadxr 407da9ddd8 export tag identifier (#1865)
#1864 Export tag identifier so we can change that form `xorm` to others

This will be useful when in some migration scenarios such as migrate `sqlx` to `xorm`, the former uses `db` as the identifier and has a very simple rule which can be covered by xorm parser rules

Co-authored-by: clannadxr <clannadxr@hotmail.com>
Reviewed-on: https://gitea.com/xorm/xorm/pulls/1865
Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: clannadxr <clannadxr@noreply.gitea.io>
Co-committed-by: clannadxr <clannadxr@noreply.gitea.io>
2021-02-09 15:20:54 +08:00
whybangbang ffac8e3577 session add method IsInTx (#1863)
Co-authored-by: whybangbang <525484036@qq.com>
Reviewed-on: https://gitea.com/xorm/xorm/pulls/1863
Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: whybangbang <whybangbang@noreply.gitea.io>
Co-committed-by: whybangbang <whybangbang@noreply.gitea.io>
2021-02-03 23:27:07 +08:00
Lunny Xiao 4629bb1717 Add NewEngineWithDB (#1860)
Reviewed-on: https://gitea.com/xorm/xorm/pulls/1860
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-committed-by: Lunny Xiao <xiaolunwen@gmail.com>
2021-02-02 14:15:10 +08:00
Lunny Xiao d41a13b562
Fix tests 2021-01-28 11:17:33 +08:00
Lunny Xiao 7c61c09af7 Revert "Automatically convert datetime to int64 (#1715)"
This reverts commit 8284e5defa.
2021-01-28 11:03:43 +08:00
Lunny Xiao 7cd51d58fa Upgrade builder to v0.3.8 (#1855)
Reviewed-on: https://gitea.com/xorm/xorm/pulls/1855
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-committed-by: Lunny Xiao <xiaolunwen@gmail.com>
2021-01-28 10:56:03 +08:00
Lunny Xiao b1297535f6 Merge branch 'master' of gitea.com:xorm/xorm 2021-01-21 15:12:38 +08:00
Lunny Xiao 34f68a05eb
Release v1.0.7 2021-01-21 15:10:21 +08:00
Lunny Xiao 6f4b2fd80e Fix bug for mssql (#1854)
Reviewed-on: https://gitea.com/xorm/xorm/pulls/1854
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-committed-by: Lunny Xiao <xiaolunwen@gmail.com>
2021-01-21 15:08:48 +08:00
L-Angel c442c5a9a8 fix_bugs_for_mssql (#1852)
1. add: support xml column type for mssql.
2. fix: array index overflow when getindexs caused by unregular indexname(eg.idx_(tablename))

Co-authored-by: Rick <lonelyangel.jcw@gmail.com>
Reviewed-on: https://gitea.com/xorm/xorm/pulls/1852
Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: L-Angel <l-angel@noreply.gitea.io>
Co-committed-by: L-Angel <l-angel@noreply.gitea.io>
2021-01-19 13:41:14 +08:00
Lunny Xiao 91e0b9aa6e
Add changelog 2021-01-05 11:06:15 +08:00
Lunny Xiao 8284e5defa Automatically convert datetime to int64 (#1715)
Fix #1714

Reviewed-on: https://gitea.com/xorm/xorm/pulls/1715
Reviewed-by: Jerry <jerry@noreply.gitea.io>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-committed-by: Lunny Xiao <xiaolunwen@gmail.com>
2021-01-05 11:04:22 +08:00
Lunny Xiao 26b248c569 Fix update bug (#1823)
Fix #1821

Reviewed-on: https://gitea.com/xorm/xorm/pulls/1823
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-committed-by: Lunny Xiao <xiaolunwen@gmail.com>
2021-01-05 10:55:36 +08:00
Lunny Xiao b65276da85 Fix index (#1841)
Reviewed-on: https://gitea.com/xorm/xorm/pulls/1841
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-committed-by: Lunny Xiao <xiaolunwen@gmail.com>
2021-01-05 10:42:14 +08:00
Lunny Xiao 7c8d3f1ad9 Fix bug when modify column on mssql (#1849)
Reviewed-on: https://gitea.com/xorm/xorm/pulls/1849
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-committed-by: Lunny Xiao <xiaolunwen@gmail.com>
2021-01-05 10:37:41 +08:00
finelog 3472d80a6d prevent panic when struct with unexport field (#1839)
prevent panic when struct with unexport field

add test for prevent panic when vanial struct with unexport field panic

minor code fix

minor fix part II

Co-authored-by: finelog <kaicltw@gmail.com>
Reviewed-on: https://gitea.com/xorm/xorm/pulls/1839
Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-Authored-By: finelog <finelog@noreply.gitea.io>
Co-Committed-By: finelog <finelog@noreply.gitea.io>
2020-12-02 22:07:35 +08:00
Lunny Xiao acb337ba1f Fix find and count bug with cols (#1826)
Fix find and count bug with cols

Reviewed-on: https://gitea.com/xorm/xorm/pulls/1826
Co-Authored-By: Lunny Xiao <xiaolunwen@gmail.com>
Co-Committed-By: Lunny Xiao <xiaolunwen@gmail.com>
2020-11-09 12:23:14 +08:00
Lunny Xiao beac298c02 Fix json tag with other type (#1822)
Fix json tag with other type

Reviewed-on: https://gitea.com/xorm/xorm/pulls/1822
Co-Authored-By: Lunny Xiao <xiaolunwen@gmail.com>
Co-Committed-By: Lunny Xiao <xiaolunwen@gmail.com>
2020-11-03 17:10:35 +08:00
jumpeiMano 17f28a1314 feat: define xorm.FromDialectAndDB (#1812)
refactor: rename the function name

feat: define xorm.FromDialectAndDB

Co-authored-by: jumpeiMano <jumpeim37@gmail.com>
Reviewed-on: https://gitea.com/xorm/xorm/pulls/1812
Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-Authored-By: jumpeiMano <jumpeimano@noreply.gitea.io>
Co-Committed-By: jumpeiMano <jumpeimano@noreply.gitea.io>
2020-10-20 11:11:04 +08:00
Lunny Xiao 0c1b815227 Performance improvement for columnsbyName (#1788)
Performance improvement for columnsbyName

Reviewed-on: https://gitea.com/xorm/xorm/pulls/1788
2020-09-09 13:44:18 +00:00