Skip to content

PostgreSQL INSERT ... ON CONFLICT Issue #1551 #1552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wumpz merged 28 commits into from
Jul 19, 2022
Merged

PostgreSQL INSERT ... ON CONFLICT Issue #1551 #1552

Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
de805ab
Adjust Gradle to JUnit 5
manticore-projects Nov 22, 2021
d5a6dca
Do not mark SpeedTest for concurrent execution
manticore-projects Nov 24, 2021
a9d0503
Remove unused imports
manticore-projects Nov 28, 2021
6dfa05f
Adjust Gradle to JUnit 5
manticore-projects Nov 22, 2021
8f0bfe6
Do not mark SpeedTest for concurrent execution
manticore-projects Nov 24, 2021
5cd0974
Remove unused imports
manticore-projects Nov 28, 2021
5f11d3f
Merge remote-tracking branch 'origin/master'
manticore-projects Nov 28, 2021
3ab04b0
Merge https://github.com/JSQLParser/JSqlParser
manticore-projects Dec 21, 2021
de94651
Merge branch 'JSQLParser:master' into master
manticore-projects Jan 24, 2022
c76ae00
Adjust Gradle to JUnit 5
manticore-projects Nov 22, 2021
b4d111e
Do not mark SpeedTest for concurrent execution
manticore-projects Nov 24, 2021
0a01f32
Remove unused imports
manticore-projects Nov 28, 2021
f55ab13
Adjust Gradle to JUnit 5
manticore-projects Nov 22, 2021
884583d
Do not mark SpeedTest for concurrent execution
manticore-projects Nov 24, 2021
50848ff
Remove unused imports
manticore-projects Nov 28, 2021
608a6ef
Merge branch 'master' of github.com:JSQLParser/JSqlParser
manticore-projects May 15, 2022
bb3a9f1
Merge github.com:JSQLParser/JSqlParser
manticore-projects May 16, 2022
15e713b
Merge remote-tracking branch 'manticore/master'
manticore-projects May 24, 2022
92c8937
Support Postgres INSERT ... ON CONFLICT
manticore-projects Jun 3, 2022
44809d4
Allow KEEP keyword
manticore-projects Jun 3, 2022
80e3f07
Sanitize before push
manticore-projects Jun 3, 2022
50a8d26
Merge remote-tracking branch 'origin/master' into InsertOnConflict
manticore-projects Jun 3, 2022
5f7da94
Tweak Grammar in order to survive the Maven Build
manticore-projects Jun 3, 2022
35ccf0b
Move Plugin configuration files to the CONFIG folder (hoping, that Co…
manticore-projects Jun 4, 2022
203076f
Update PMD in the Maven and Gradle configuration
manticore-projects Jun 4, 2022
fadd055
Merge remote-tracking branch 'origin/master' into InsertOnConflict
manticore-projects Jul 18, 2022
07f1950
Appease Codacy
manticore-projects Jul 18, 2022
760045e
Merge branch 'master' into InsertOnConflict
wumpz Jul 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Do not mark SpeedTest for concurrent execution
  • Loading branch information
@manticore-projects
manticore-projects committed Apr 23, 2022
commit b4d111e17d000e66a838194126bc4da18c61909b
2 changes: 1 addition & 1 deletion src/test/java/net/sf/jsqlparser/statement/select/SpeedTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import org.junit.jupiter.api.parallel.Execution;
import org.junit.jupiter.api.parallel.ExecutionMode;

@Execution(ExecutionMode.CONCURRENT)
//@Execution(ExecutionMode.CONCURRENT)
public class SpeedTest {

private final static int NUM_REPS_500 = 500;
Expand Down