Gitea-Mirror/xorm
1
0
Fork 0
mirror of https://gitea.com/xorm/xorm synced 2025-10-06 08:12:43 +02:00
Code Issues Releases Activity
1,695 Commits 168 Branches 74 Tags
52b01ce67fe94ddaa0411679d55c308858acb51a
Commit Graph

380 Commits

Author SHA1 Message Date
Lunny Xiao
068de8c0f8 Don't warn when database have extra columns which are not in struct (#2279) 
Reviewed-on: https://gitea.com/xorm/xorm/pulls/2279
 2023-06-23 08:48:37 +00:00
datbeohbbh
d485abba57 add (*Engine) SetConnMaxIdleTime (#2229) 
issue: https://gitea.com/xorm/xorm/issues/2228
Co-authored-by: datbeohbbh <phongtomfapp@gmail.com>
Reviewed-on: https://gitea.com/xorm/xorm/pulls/2229
Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: datbeohbbh <datbeohbbh@noreply.gitea.io>
Co-committed-by: datbeohbbh <datbeohbbh@noreply.gitea.io>
 2023-03-06 18:55:33 +08:00
KN4CK3R
056cecc97e Add Truncate method (#2220) 
This PR adds a `Truncate` method which allows to delete all existing rows in a table. The current `Delete` implementation enforces conditions to prevent accidental data deletion.

Co-authored-by: KN4CK3R <admin@oldschoolhack.me>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Reviewed-on: https://gitea.com/xorm/xorm/pulls/2220
Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: KN4CK3R <kn4ck3r@noreply.gitea.io>
Co-committed-by: KN4CK3R <kn4ck3r@noreply.gitea.io>
 2023-02-20 07:17:35 +08:00
datbeohbbh
7dc2a18876 Bug fix: Rows must be closed after used (#2214) 
Issue: [#2213](https://gitea.com/xorm/xorm/issues/2213#issue-132724)
Co-authored-by: datbeohbbh <phongtomfapp@gmail.com>
Reviewed-on: https://gitea.com/xorm/xorm/pulls/2214
Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: datbeohbbh <datbeohbbh@noreply.gitea.io>
Co-committed-by: datbeohbbh <datbeohbbh@noreply.gitea.io>
 2023-02-03 17:24:16 +08:00
Lunny Xiao
f1bfc5ce98 join support condition (#2201) 
Reviewed-on: https://gitea.com/xorm/xorm/pulls/2201
 2022-12-09 23:37:26 +08:00
Lunny Xiao
f9a6990ecb Refactor orderby and support arguments (#2150) 
Reviewed-on: https://gitea.com/xorm/xorm/pulls/2150
 2022-05-31 11:00:28 +08:00
Andrew Thornton
cd36b112ae Escape string and blob results from dump more correctly (#2091) 
dumpTables currently badly handles BLOB and TEXT data containing control
characters:

* MySQL will interpret and unescape string literals e.g.`\r` will become
carriage return.

* Postgres will not allow string literals to contain NUL nor will
SQLite so BLOBs will not dump correctly.

* Schemas should not be set on the destination dump

* MSSQL needs the N prefix to correctly ensure that UTF-8 data is
correctly transferred.

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

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Reviewed-on: https://gitea.com/xorm/xorm/pulls/2091
Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: Andrew Thornton <art27@cantab.net>
Co-committed-by: Andrew Thornton <art27@cantab.net>
 2022-01-07 16:04:01 +08:00
Andrew Thornton
470807151d fix cross db dumping of bools (#2089) 
When dumping booleans these need to be converted from the original DB representation
to the new db representation. In the case of most DBs this is simply to 0 or 1 but
for postgres these have to be false or true.

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

Reviewed-on: https://gitea.com/xorm/xorm/pulls/2089
Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: Andrew Thornton <art27@cantab.net>
Co-committed-by: Andrew Thornton <art27@cantab.net>
 2022-01-05 09:37:18 +08:00
Lunny Xiao
a2d3669edf Add README and fix some lints (#2079) 
as title.

Reviewed-on: https://gitea.com/xorm/xorm/pulls/2079
 2021-12-14 09:00:35 +08:00
Lunny Xiao
0a429a241d Drop sync function and rename sync2 to sync (#2018) 
Reviewed-on: https://gitea.com/xorm/xorm/pulls/2018
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-committed-by: Lunny Xiao <xiaolunwen@gmail.com>
 2021-08-24 17:13:17 +08:00
Lunny Xiao
d92fb412ee Make Get and Rows.Scan accept multiple parameters (#2029) 
Now the below behaviours are allowed.

```Go
var id int64
var name string
has, err := engine.Table(&user).Cols("id", "name").Get(&id, &name)
// SELECT id, name FROM user LIMIT 1
```

```Go
rows, err := engine.Cols("name", "age").Rows(&User{Name:name})
// SELECT * FROM user
defer rows.Close()
for rows.Next() {
    var name string
    var age int
    err = rows.Scan(&name, &age)
}
```

Reviewed-on: https://gitea.com/xorm/xorm/pulls/2029
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-committed-by: Lunny Xiao <xiaolunwen@gmail.com>
 2021-08-24 15:42:34 +08:00
Lunny Xiao
c29b9649a9 Add dameng support (#2007) 
driver: https://gitee.com/travelliu/dm
docker: https://download.dameng.com/eco/dm8/dm8_docker.tar

fix #1837

Reviewed-on: https://gitea.com/xorm/xorm/pulls/2007
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-committed-by: Lunny Xiao <xiaolunwen@gmail.com>
 2021-08-24 13:46:08 +08:00
Lunny Xiao
0b3cc25a10 Add pgx driver support (#1795) 
Fix #858

Reviewed-on: https://gitea.com/xorm/xorm/pulls/1795
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-committed-by: Lunny Xiao <xiaolunwen@gmail.com>
 2021-08-05 14:04:11 +08:00
Lunny Xiao
42c2f158e8 Fix timesatmp (#2021) 
Now `Datetime` support `Datime(6)` to indicate the time scale. For different database , the max scale is not different.

`Datetime` means `Datetime(0)`.

Reviewed-on: https://gitea.com/xorm/xorm/pulls/2021
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-committed-by: Lunny Xiao <xiaolunwen@gmail.com>
 2021-08-04 16:12:10 +08:00
Lunny Xiao
a7e010df2d refactor insert condition generation (#1998) 
Reviewed-on: https://gitea.com/xorm/xorm/pulls/1998
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-committed-by: Lunny Xiao <xiaolunwen@gmail.com>
 2021-07-20 13:46:24 +08:00
Lunny Xiao
86775af2ec refactor and add setjson function (#1997) 
Fix #1992

Reviewed-on: https://gitea.com/xorm/xorm/pulls/1997
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-committed-by: Lunny Xiao <xiaolunwen@gmail.com>
 2021-07-19 13:43:53 +08:00
Lunny Xiao
aaa2111e8f Refactor asbytes (#1995) 
Reviewed-on: https://gitea.com/xorm/xorm/pulls/1995
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-committed-by: Lunny Xiao <xiaolunwen@gmail.com>
 2021-07-19 00:21:46 +08:00
Lunny Xiao
8bf97de140 Fix bug on dumptable (#1984) 
Fix #1983

Reviewed-on: https://gitea.com/xorm/xorm/pulls/1984
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-committed-by: Lunny Xiao <xiaolunwen@gmail.com>
 2021-07-11 20:05:43 +08:00
Lunny Xiao
8f64a78cd4 Support delete with no bean (#1926) 
Now you can use delete like this:

```
orm.Table("my_table").Where("id=?",1).Delete()
```

Reviewed-on: https://gitea.com/xorm/xorm/pulls/1926
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-committed-by: Lunny Xiao <xiaolunwen@gmail.com>
 2021-07-06 17:11:45 +08:00
Lunny Xiao
d0e5dba40e Query interface (#1965) 
refactor query interface

Reviewed-on: https://gitea.com/xorm/xorm/pulls/1965
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-committed-by: Lunny Xiao <xiaolunwen@gmail.com>
 2021-07-04 21:23:17 +08:00
Lunny Xiao
65846bacc3 Improve QueryString performance (#1962) 
As title.

Reviewed-on: https://gitea.com/xorm/xorm/pulls/1962
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-committed-by: Lunny Xiao <xiaolunwen@gmail.com>
 2021-07-02 11:25:20 +08:00
Lunny Xiao
8f8195a86b Improve get field value of bean (#1961) 
Reviewed-on: https://gitea.com/xorm/xorm/pulls/1961
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-committed-by: Lunny Xiao <xiaolunwen@gmail.com>
 2021-06-29 14:32:29 +08:00
Lunny Xiao
7fd6356a85 Add DBVersion (#1723) 
Reviewed-on: https://gitea.com/xorm/xorm/pulls/1723
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-committed-by: Lunny Xiao <xiaolunwen@gmail.com>
 2021-06-12 15:06:05 +08:00
Andrew Thornton
d2f52eba64 Byte strings in postgres aren't 0x... (#1906) 
Byte strings in postgres are actually E'\x...' not 0x...

This is part of the follow-up to #1872

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

Reviewed-on: https://gitea.com/xorm/xorm/pulls/1906
Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: Andrew Thornton <art27@cantab.net>
Co-committed-by: Andrew Thornton <art27@cantab.net>
 2021-05-09 15:09:59 +08:00
Andrew Thornton
dab09c73ab Fix another bug with #1872 (#1905) 
Ensure that structs, arrays and slices are properly converted to strings.

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

Reviewed-on: https://gitea.com/xorm/xorm/pulls/1905
Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: Andrew Thornton <art27@cantab.net>
Co-committed-by: Andrew Thornton <art27@cantab.net>
 2021-05-08 21:39:03 +08:00
Andrew Thornton
210c30a7dd Fix two issues with dumptables (#1903) 
There are two issues with #1872 which have become apparent
after testing on Gitea.

1. Ensure structs which are have before processors run correctly
2. Ensure structs extending other structs work
3. Ensure that numerical enums become numeric

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

Reviewed-on: https://gitea.com/xorm/xorm/pulls/1903
Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: Andrew Thornton <art27@cantab.net>
Co-committed-by: Andrew Thornton <art27@cantab.net>
 2021-05-08 12:27:22 +08:00
Andrew Thornton
912c2524f8 RFC: Use provided type to create the dstTable rather than inferring from the SQL types (#1872) 
When using dumptables to convert between dialects if a struct is provided we should use it to generate the SQL types rather than infer them by mapping from the sql types.

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

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Reviewed-on: https://gitea.com/xorm/xorm/pulls/1872
Co-authored-by: Andrew Thornton <art27@cantab.net>
Co-committed-by: Andrew Thornton <art27@cantab.net>
 2021-05-07 09:19:03 +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
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
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
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
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
MURAOKA Taro
56881e64a9 put ContextLogger in higher priority (#1656) 
Merge branch 'master' into logger-priority

Merge branch 'master' into logger-priority

Merge branch 'master' into logger-priority

Merge branch 'master' into logger-priority

put ContextLogger in higher priority

SetLogger use `Logger` when give a interface which implements both
ContextLogger and Logger.  Because Go's type `switch` uses prior `case`.

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: MURAOKA Taro <koron.kaoriya@gmail.com>
Reviewed-on: https://gitea.com/xorm/xorm/pulls/1656
 2020-07-09 06:44:26 +00:00
Lunny Xiao
1a39682180 Fix dump of sqlite (#1639) 
Fix test

fix test

Fix sqlite dump

Fix sqlite dump

Reviewed-on: https://gitea.com/xorm/xorm/pulls/1639
 2020-07-09 01:41:12 +00:00
Lunny Xiao
9b41b879a7 return the result on transaction (#1725) 
return the result on transaction

Reviewed-on: https://gitea.com/xorm/xorm/pulls/1725
 2020-06-26 13:06:46 +00:00
Lunny Xiao
4dde8f14e6 Fix find and count bug (#1651) 
Fix bug

fix mssql findandcount

Fix find and count bug

Reviewed-on: https://gitea.com/xorm/xorm/pulls/1651
 2020-06-13 05:31:33 +00:00
limo.creed
34dc7f8791 Add Hook (#1644) 
move hook to standalone package

add hook for engine

Co-authored-by: yuxiao.lu <yuxiao.lu@liulishuo.com>
Reviewed-on: https://gitea.com/xorm/xorm/pulls/1644
Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com>
 2020-04-09 06:03:39 +00:00
Lunny Xiao
79bdda3cf1 Move all integrations tests to a standalone sub package (#1635) 
Fix vet

Remove unused files

Move all integrations tests to a standalone sub package

Reviewed-on: https://gitea.com/xorm/xorm/pulls/1635
 2020-03-27 07:13:04 +00:00
Lunny Xiao
78bb4c711d Improve codes (#1630) 
Improve codes

Reviewed-on: https://gitea.com/xorm/xorm/pulls/1630
 2020-03-26 13:24:11 +00:00
Lunny Xiao
b78418daa5 Support session id (#1632) 
small nit

Support session id

Reviewed-on: https://gitea.com/xorm/xorm/pulls/1632
 2020-03-26 12:31:08 +00:00
Lunny Xiao
fb8eb29d1e Fix lint errors (#1631) 
Fix lint errors

Reviewed-on: https://gitea.com/xorm/xorm/pulls/1631
 2020-03-26 04:41:02 +00:00
Lunny Xiao
5053c35701 Don't keep db on dialects (#1623) 
don't keep db on dialects

Reviewed-on: https://gitea.com/xorm/xorm/pulls/1623
 2020-03-24 02:19:24 +00:00
Lunny Xiao
af30c17b0d Fix dump bug (#1613) 
Fix dump

Fix dump bug

Reviewed-on: https://gitea.com/xorm/xorm/pulls/1613
 2020-03-21 16:05:12 +00:00
Lunny Xiao
a7a1dc5c42 Fix setschema (#1606) 
Fix schema

Fix setschema

Reviewed-on: https://gitea.com/xorm/xorm/pulls/1606
 2020-03-17 06:50:06 +00:00
Lunny Xiao
b7b2b21a40 Fix dump/import bug (#1603) 
Fix bug

Fix mssql

Fix postgres

Fix import test

Fix dump/import bug

Reviewed-on: https://gitea.com/xorm/xorm/pulls/1603
 2020-03-15 02:02:37 +00:00
Lunny Xiao
c56c8e122a Fix master/slave bug (#1601) 
fix test

Fix master/slave bug

Reviewed-on: https://gitea.com/xorm/xorm/pulls/1601
 2020-03-13 00:42:01 +00:00
Lunny Xiao
367b15879e Fix bug when dump (#1597) 
Fix bug when dump

Reviewed-on: https://gitea.com/xorm/xorm/pulls/1597
 2020-03-11 23:30:35 +00:00
Lunny Xiao
537d82a6f7 Ignore schema when dbtype is not postgres (#1593) 
Ignore schema when dbtype is not postgres

Reviewed-on: https://gitea.com/xorm/xorm/pulls/1593
 2020-03-10 13:15:18 +00:00
Lunny Xiao
00b65c6d99 Update README (#1582) 
Remove version

Update README

Reviewed-on: https://gitea.com/xorm/xorm/pulls/1582
 2020-03-08 06:10:05 +00:00