BreakChange: NoAutoCondition 不再影响deleted条件生成，deleted条件仅由Unscoped控制 #2418

Open

CyJaySong wants to merge 57 commits from CyJaySong/xorm:v1 into v1

pull from: CyJaySong/xorm:v1

merge into: xorm:v1

xorm:v1

xorm:lunny/vul_scan

xorm:main

xorm:lunny/test_extends

xorm:lunny/oracle_ci

xorm:lunny/fix_distinct_count

xorm:lunny/postgres_for_update

xorm:lunny/executors

xorm:lunny/dm_ci

xorm:lunny/dm_upgrade

Conversation 2 Commits 57 Files Changed 7 +50 -68

CyJaySong commented 2024-02-26 02:05:05 +00:00

Contributor

Copy Link

BreakChange: NoAutoCondition 不再影响deleted条件生成，deleted条件仅由Unscoped控制， 之前 NoAutoCondition 不会干扰Find自动生成deleted条件，但是Get查询会干扰，逻辑不一致
BreakChange: FindAndCount 函数Count 查询 与 Find 查询的条件保持一致，之前Count时会加一个Unscoped, 导致Count结果 包含了已删除数量，但是Find结果并不包含已删除数据

BreakChange: NoAutoCondition 不再影响deleted条件生成，deleted条件仅由Unscoped控制， 之前 NoAutoCondition 不会干扰Find自动生成deleted条件，但是Get查询会干扰，逻辑不一致 BreakChange: FindAndCount 函数Count 查询 与 Find 查询的条件保持一致，之前Count时会加一个Unscoped, 导致Count结果 包含了已删除数量，但是Find结果并不包含已删除数据

👍 2

CyJaySong added 56 commits 2024-02-26 02:05:05 +00:00

Fix deleted tag attribute zeroTime is not DatabaseTZ 7e11f585aa

change test Struct name ff292dfcf3

fix time parse layout 158b67964b

add test code efc4e6ab1d

Merge branch 'fix_time_parse_layout' 80f0d1218a

fix zero time 85dd334d2f

fix zero time 1167465867

del not right test struct 93ef9bd84a

SQL Server database, default mapping of time type to DATETIME2 a16551c6e7

SQL Server database, default mapping of time type to DATETIME2 7bb3224115

fix conditions build on MSSQL a6b31d79d7

fix TestTagTime 50ef83d456

fix String2Time eb076f4b94

Merge branch 'master' ...

# Conflicts:
#	convert/time.go

48cf8bb174

fix code 269811a497

fix code 21b54e5d61

fix code 58ba01b299

Merge branch 'master' of gitea.com:CyJaySong/xorm into CyJaySong-master b75df472e4

Merge branch 'master' ...

# Conflicts:
#	convert/time.go

9e362d7913

fix code 82327cba2f

Merge remote-tracking branch 'cyjay/master' 4b458f1c75

Merge branch 'master' 0c82bad52b

fix String2Time 64ad1ac161

fix String2Time 3396c4cbba

SQL Server database, default mapping of time type to DATETIME2 6c8799fdea

fix code fff2adbf77

improve tests d9f3ee63ef

Merge branch 'master' ...

# Conflicts:
#	tests/session_insert_test.go

2d9e07360a

Merge remote-tracking branch 'cyjay/master' 620074d751

Merge pull request 'merge xorm:master' (#2) from xorm/xorm:master into master ...

Reviewed-on: CyJaySong/xorm#2

37eadc847c

Fix the issue of incorrect insertion of data in non UTC time zone zero for numeric types 24540c9e23

Merge remote-tracking branch 'cyjay/master' ad73876977

Fix ci (#2330) ...

Reviewed-on: #2330
(cherry picked from commit eeacd22674)

6b554f8b74

Add test for max ( id ) (#2316) ...

Reviewed-on: #2316
(cherry picked from commit 407375c9b4)

6a9b4ef926

fix PostgreSQL version (#2332) ...

Reviewed-on: #2332
Co-authored-by: zzdboy <28206697@qq.com>
Co-committed-by: zzdboy <28206697@qq.com>
(cherry picked from commit 2885c88b77)

d98f626ae7

Remove dead code from session.SyncWithOptions() (#2323) ...

db7c264062/sync.go (L229-L231)

as oriIndex only is **not** nil if index.Equal(index2)

and index.Equal(index2) check if `oriIndex.Type == index.Type` ... so it always is false

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Reviewed-on: #2323
Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: 6543 <6543@obermui.de>
Co-committed-by: 6543 <6543@obermui.de>
(cherry picked from commit e5be0f4129)

13120b6d55

fix the error in mysql: unknown colType UNSIGNED FLOAT (#2143) ...

Error: unknown colType UNSIGNED FLOAT
in mysql 5.6.27 or 5.7.32

Fix #2123

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Reviewed-on: #2143
Co-authored-by: Ryan Liu <azhai@126.com>
Co-committed-by: Ryan Liu <azhai@126.com>
(cherry picked from commit ac88a5705a)

be88b18a8e

modify limit offset implement (#2188) ...

Oracle and SQLServer specific: When `LIMIT OFFSET` function is needed, use `OFFSET <offset> ROWS FETCH NEXT <limit> ROWS ONLY` to replace legacy subquery.

SQLServer specific: When `ORDER BY` is not set and `OFFSET FETCH` is set, set `statement.orderStr` to `1` (`ORDER BY 1`). See [here](https://learn.microsoft.com/zh-cn/sql/t-sql/queries/select-order-by-clause-transact-sql?view=sql-server-ver16).

MySQL specific: When limit is 0 and offset > 0, use `LIMIT 9223372036854775807` ($2^{63}-1$). See comments [here](15d171ea55/internal/statements/query.go (L314)).

Reviewed-on: #2188
Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: FlyingOnion <731677080@qq.com>
Co-committed-by: FlyingOnion <731677080@qq.com>
(cherry picked from commit 551de3767c)

c73fc585bb

fix KingbaseES version (#2335) ...

Reviewed-on: #2335
Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: zzdboy <28206697@qq.com>
Co-committed-by: zzdboy <28206697@qq.com>
(cherry picked from commit 3eda0f7805)

9dc48367c8

some refactors for write functions (#2342) ...

Reviewed-on: #2342
(cherry picked from commit 0f085408af)

37fd7d3c15

Fix bug when join with alias start with a (#2343) ...

Fix #2331

Reviewed-on: #2343
(cherry picked from commit 6ef0a7798f)

9c82535c2e

Fix the issue of incorrect insertion of data in non UTC time zone zero for numeric types 0311205d4d

Fix the issue of incorrect insertion of data in non UTC time zone zero for numeric types 747a357ea9

Fix code 6f9df57c50

Merge branch 'master' into main2 ...

# Conflicts:
#	tests/session_insert_test.go

f758792496

Fix code d35a3e00b9

Revert "Revert "Fix deleted tag attribute zeroTime is not DatabaseTZ (#2299)" (#2341)" ...

This reverts commit dbe49909

85502d4779

Fix code d3926afde6

Fix code 408217218b

Fix code 056952e17a

Fix code 2255193c57

Fix code 84c44e90cd

Fix code c09a9bdfc1

Merge remote-tracking branch 'xorm/v1' into v1 3e6294dc7e

💥 NoAutoCondition 不再影响deleted条件生成，deleted条件仅由Unscoped控制 8f07aa25b9

Merge remote-tracking branch 'xorm/v1' into v1 9769a5e1c4

CyJaySong changed title from WIP: v1 BreakChange: NoAutoCondition 不再影响deleted条件生成，deleted条件仅由Unscoped控制 to BreakChange: NoAutoCondition 不再影响deleted条件生成，deleted条件仅由Unscoped控制 2024-02-26 07:20:24 +00:00

Notealot commented 2024-03-05 09:18:46 +00:00

First-time contributor

Copy Link

我觉得这个就放到 v1.4.x 发版也没问题，怎么会有这么恶性的bug的

我觉得这个就放到 v1.4.x 发版也没问题，怎么会有这么恶性的bug的

CyJaySong commented 2024-03-12 09:34:33 +00:00

Author

Contributor

Copy Link

我觉得这个就放到 v1.4.x 发版也没问题，怎么会有这么恶性的bug的

可能是FindAndCount这个函数很少人用吧

> 我觉得这个就放到 v1.4.x 发版也没问题，怎么会有这么恶性的bug的 可能是FindAndCount这个函数很少人用吧

CyJaySong added 1 commit 2024-04-09 06:10:07 +00:00

Merge branch 'xorm-v1' into cyjay-v1 805f4ebdaf

Some checks failed

Hide all checks

test mariadb / test mariadb (pull_request) Successful in 12m37s

Required

Details

test postgres / test postgres (pull_request) Successful in 12m49s

Required

Details

test mssql / test mssql with collation (pull_request) Successful in 13m10s

Required

Details

test cockroach / test cockroach (pull_request) Successful in 13m52s

Required

Details

test tidb / test tidb (pull_request) Successful in 10m53s

Required

Details

test mysql / test mysql (pull_request) Failing after 0s

Required

Details

test sqlite / unit test & test sqlite (pull_request) Successful in 12m43s

Required

Details

test mysql8 / test mysql8 (pull_request) Successful in 11m5s

Required

Details

test mssql / test mssql (pull_request) Successful in 11m31s

Required

Details

This pull request doesn't have enough approvals yet. 0 of 1 approvals granted.

This branch is out-of-date with the base branch

You are not authorized to merge this pull request.

View command line instructions.

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u v1:CyJaySong-v1

git checkout CyJaySong-v1

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels   

backport/done

  

backport/v1

  

blocked

  

db

oracle

  

db

sqlserver

  

duplicate

  

feature

cache

  

frontport/done

  

frontport/main

  

invalid

  

kind

breaking

  

kind

bug

  

kind

build

  

kind

dependencies

  

kind

docs

  

kind

driver

  

kind

enhancement

  

kind

feature

  

kind

performance

  

kind

proposal

  

kind

question

  

kind

refactor

  

kind

testing

  

need

feedback

  

need

test

  

proposal:accepted

  

RaspBerry Pi

  

regression

  

skip-changelog

  

upstream

  

wip

  

wontfix

No Label

backport/done

backport/v1

blocked

db

oracle

db

sqlserver

duplicate

feature

cache

frontport/done

frontport/main

invalid

kind

breaking

kind

bug

kind

build

kind

dependencies

kind

docs

kind

driver

kind

enhancement

kind

feature

kind

performance

kind

proposal

kind

question

kind

refactor

kind

testing

need

feedback

need

test

proposal:accepted

RaspBerry Pi

regression

skip-changelog

upstream

wip

wontfix

Milestone

Clear milestone

No items

No Milestone

Assignees

Clear assignees

No Assignees

2 Participants

Notifications

Subscribe

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: xorm/xorm#2418

No description provided.