xorm/xorm
xorm/xorm
64
359
Fork 208
Code Issues 373 Pull Requests 18 Actions Releases 35 Activity

Add Sync options to ignore constrains and indices #2320

Merged
lunny merged 10 commits from 6543/xorm:SyncOptions_add_IgnoreConstrains into master 2023-08-09 03:28:55 +00:00
Conversation 5 Commits 10 Files Changed 3 +138 -16
6543 commented 2023-08-05 01:19:54 +00:00
Contributor
Copy Link

needed for https://github.com/woodpecker-ci/woodpecker/pull/2117

needed for https://github.com/woodpecker-ci/woodpecker/pull/2117
6543 added 2 commits 2023-08-05 01:19:58 +00:00
remove dead code
Some checks failed
test cockroach / test cockroach (pull_request) Has been cancelled
Details
test mariadb / test mariadb (pull_request) Has been cancelled
Details
test mssql / test mssql (pull_request) Has been cancelled
Details
test mysql / test mysql (pull_request) Has been cancelled
Details
test mysql8 / test mysql8 (pull_request) Has been cancelled
Details
test postgres / test postgres (pull_request) Has been cancelled
Details
test sqlite / unit test & test sqlite (pull_request) Has been cancelled
Details
test tidb / test tidb (pull_request) Has been cancelled
Details
93b9dc3fd9
6543 added 1 commit 2023-08-05 01:24:20 +00:00
add more info to code comment
Some checks failed
test cockroach / test cockroach (pull_request) Has been cancelled
Details
test mariadb / test mariadb (pull_request) Has been cancelled
Details
test mssql / test mssql (pull_request) Has been cancelled
Details
test mysql / test mysql (pull_request) Has been cancelled
Details
test mysql8 / test mysql8 (pull_request) Has been cancelled
Details
test postgres / test postgres (pull_request) Has been cancelled
Details
test sqlite / unit test & test sqlite (pull_request) Has been cancelled
Details
test tidb / test tidb (pull_request) Has been cancelled
Details
020a74861b
6543 added 1 commit 2023-08-05 01:26:37 +00:00
better english
All checks were successful
test tidb / test tidb (pull_request) Successful in 5m33s
Details
test sqlite / unit test & test sqlite (pull_request) Successful in 8m41s
Details
test cockroach / test cockroach (pull_request) Successful in 7m23s
Details
test mariadb / test mariadb (pull_request) Successful in 4m34s
Details
test mysql / test mysql (pull_request) Successful in 5m9s
Details
test mssql / test mssql (pull_request) Successful in 6m8s
Details
test mysql8 / test mysql8 (pull_request) Successful in 5m13s
Details
test postgres / test postgres (pull_request) Successful in 5m41s
Details
33765faf2f
6543 requested review from lunny 2023-08-05 04:05:37 +00:00
lunny reviewed 2023-08-05 06:23:50 +00:00
sync.go Outdated
@ -221,24 +235,22 @@ func (session *Session) SyncWithOptions(opts SyncOptions, beans ...interface{})
}
}
if oriIndex != nil {
lunny commented 2023-08-05 06:23:50 +00:00
Owner
Copy Link

So why remove these lines?

So why remove these lines?
6543 commented 2023-08-05 15:54:20 +00:00
Author
Contributor
Copy Link

see 93b9dc3fd9 :

because you can merge the two if statements to oriIndex != nil && oriIndex.Type != index.Type witch is always false as it is checked 7 lines aboth

( -> it check if index2 is equal index and if true oriIndex is not nill
so if origIndex != index -> origIndey = nil -> false && true
so if origIndex == index -> origIndex != nil -> true && false
)

see https://gitea.com/xorm/xorm/commit/93b9dc3fd96e1c0e62f03d9346303deaa4522a16 : because you can merge the two if statements to `oriIndex != nil && oriIndex.Type != index.Type` witch is always false as it is checked 7 lines aboth ( -> it check if index2 is equal index and if true oriIndex is not nill so if origIndex != index -> origIndey = nil -> `false && true` so if origIndex == index -> origIndex != nil -> `true && false` )
6543 marked this conversation as resolved
6543 added 2 commits 2023-08-06 16:30:08 +00:00
Add tests for SyncWithOptions
All checks were successful
test mariadb / test mariadb (pull_request) Successful in 4m52s
Details
test cockroach / test cockroach (pull_request) Successful in 7m32s
Details
test mssql / test mssql (pull_request) Successful in 5m49s
Details
test mysql / test mysql (pull_request) Successful in 4m49s
Details
test mysql8 / test mysql8 (pull_request) Successful in 5m3s
Details
test postgres / test postgres (pull_request) Successful in 5m43s
Details
test tidb / test tidb (pull_request) Successful in 5m37s
Details
test sqlite / unit test & test sqlite (pull_request) Successful in 8m32s
Details
884358aecd
6543 commented 2023-08-06 16:31:20 +00:00
Author
Contributor
Copy Link

@lunny added tests to cover the new cases ... this implied that I have to add the SyncWithOptions had to be added to EngineInterface

@lunny added tests to cover the new cases ... this implied that I have to add the **SyncWithOptions** had to be added to **EngineInterface**
6543 added 1 commit 2023-08-06 17:12:45 +00:00
enhance test
Some checks failed
test mariadb / test mariadb (pull_request) Failing after 4m32s
Details
test cockroach / test cockroach (pull_request) Failing after 5m6s
Details
test mssql / test mssql (pull_request) Failing after 4m49s
Details
test mysql / test mysql (pull_request) Failing after 4m47s
Details
test mysql8 / test mysql8 (pull_request) Failing after 4m38s
Details
test postgres / test postgres (pull_request) Failing after 4m38s
Details
test sqlite / unit test & test sqlite (pull_request) Failing after 4m16s
Details
test tidb / test tidb (pull_request) Failing after 4m26s
Details
5c957acce4
6543 added 1 commit 2023-08-06 17:13:42 +00:00
fix
All checks were successful
test mariadb / test mariadb (pull_request) Successful in 4m59s
Details
test cockroach / test cockroach (pull_request) Successful in 6m57s
Details
test mssql / test mssql (pull_request) Successful in 6m14s
Details
test sqlite / unit test & test sqlite (pull_request) Successful in 8m59s
Details
test mysql / test mysql (pull_request) Successful in 4m56s
Details
test mysql8 / test mysql8 (pull_request) Successful in 5m1s
Details
test postgres / test postgres (pull_request) Successful in 5m48s
Details
test tidb / test tidb (pull_request) Successful in 4m27s
Details
efc36dec89
6543 commented 2023-08-06 17:14:57 +00:00
Author
Contributor
Copy Link

I would say it's ready?

I would say it's ready?
6543 commented 2023-08-06 18:07:40 +00:00
Author
Contributor
Copy Link

CI failed unrelated :/

CI failed unrelated :/
👍 1
lunny reviewed 2023-08-07 04:17:37 +00:00
sync.go Outdated
@ -221,24 +235,22 @@ func (session *Session) SyncWithOptions(opts SyncOptions, beans ...interface{})
}
}
if oriIndex != nil {
lunny commented 2023-08-07 04:17:37 +00:00
Owner
Copy Link

I still cannot understand why this lines should be removed.

I still cannot understand why this lines should be removed.
6543 commented 2023-08-07 14:13:59 +00:00
Author
Contributor
Copy Link

I have added it back and we can move this into another pull / discussion

I have added it back and we can move this into another pull / discussion
6543 marked this conversation as resolved
6543 added 2 commits 2023-08-07 14:13:25 +00:00
limit diff
All checks were successful
test mariadb / test mariadb (pull_request) Successful in 4m49s
Details
test cockroach / test cockroach (pull_request) Successful in 7m30s
Details
test mssql / test mssql (pull_request) Successful in 5m52s
Details
test mysql / test mysql (pull_request) Successful in 4m43s
Details
test mysql8 / test mysql8 (pull_request) Successful in 5m12s
Details
test postgres / test postgres (pull_request) Successful in 5m41s
Details
test tidb / test tidb (pull_request) Successful in 5m37s
Details
test sqlite / unit test & test sqlite (pull_request) Successful in 8m22s
Details
fc77a3b490
6543 commented 2023-08-07 14:38:06 +00:00
Author
Contributor
Copy Link

CI passed 🚀

CI passed 🚀
6543 commented 2023-08-08 17:26:40 +00:00
Author
Contributor
Copy Link

@lunny do i have to do something else?

@lunny do i have to do something else?
lunny approved these changes 2023-08-09 03:28:39 +00:00
lunny merged commit db7c264062 into master 2023-08-09 03:28:55 +00:00
lunny added the
kind
enhancement
 label 2023-08-09 03:29:20 +00:00
lunny added this to the 1.3.3 milestone 2023-08-09 03:29:25 +00:00
6543 deleted branch SyncOptions_add_IgnoreConstrains 2023-08-09 15:57:12 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
lunny
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
1.3.3
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
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#2320
No description provided.
Delete Branch "6543/xorm:SyncOptions_add_IgnoreConstrains"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?