Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
b527ee2
Add ModelSetup to unify setup codes
TimothyGillespie Mar 21, 2021
e2fc84b
Abstracted away QueryStringBuilder from query tree to allow implement…
JanHolger Mar 30, 2021
a3f1387
Added test action for feature branches
JanHolger Mar 30, 2021
057e32a
Fixed the failing test
JanHolger Mar 30, 2021
26da182
Merge remote-tracking branch 'origin/master' into maintenance
JanHolger Mar 30, 2021
bddf070
Merged master and fixed broken calls due to local changes
JanHolger Mar 30, 2021
aba6336
Merge remote-tracking branch 'origin/master' into maintenance
JanHolger Mar 30, 2021
478ef58
Added validation for operators and non raw column names
JanHolger Mar 30, 2021
b22b7e8
Added validation for operators and non raw column names
JanHolger Mar 30, 2021
480b883
Merge branch 'master' into TimothyGillespie/addOrderByTests
TimothyGillespie Mar 31, 2021
49e4fa0
Add assertOrderByContains method
TimothyGillespie Mar 31, 2021
8aaedb2
Add SectionIndexOutOfBoundException
TimothyGillespie Mar 31, 2021
1ae8ac8
Add retrieval methods for the sections
TimothyGillespie Mar 31, 2021
5d4e233
Add JavaDocs for getSectionList too
TimothyGillespie Mar 31, 2021
89c48dc
Add JavaDocs for getSectionList too
TimothyGillespie Mar 31, 2021
51907a4
Reorder methods more logically
TimothyGillespie Mar 31, 2021
ac7140e
Add assertSectionEquals method
TimothyGillespie Mar 31, 2021
5491a48
Remove OrderBy specific contains method
TimothyGillespie Mar 31, 2021
6f97433
Make assertion methods chainable
TimothyGillespie Mar 31, 2021
b73d7db
Add better fitting internal assert for the equal assertion
TimothyGillespie Mar 31, 2021
710b6c5
Add tests for OrderBy Clauses
TimothyGillespie Mar 31, 2021
9e857cf
Merge branch 'TimothyGillespie/addOrderByTests' of github.com:JavaWeb…
TimothyGillespie Mar 31, 2021
0201c3d
Added extra fields to Model and added QueryWith but didn't yet implem…
JanHolger Mar 31, 2021
e4d3fc0
Remove explicit ASC as discussed
TimothyGillespie Apr 1, 2021
abdab9e
Add JavaDocs for QueryGroup
TimothyGillespie Apr 2, 2021
0a684f9
Add equals and hashcode overwrite to QueryColumn
TimothyGillespie Apr 2, 2021
17a7060
Add multiple order by capability
TimothyGillespie Apr 2, 2021
0037a3a
Merge branch 'TimothyGillespie/enableMultipleOrderBy' into TimothyGil…
TimothyGillespie Apr 2, 2021
fb00e4d
Adjust MySQL Query Building for the new OrderBy and fix OrderBy test
TimothyGillespie Apr 2, 2021
018ce02
Add test to assert the correct sort priority
TimothyGillespie Apr 2, 2021
c8e9a40
Add error case for calling order on same column twice
TimothyGillespie Apr 2, 2021
37ed312
Add note of purpose of OrderByClauseTest
TimothyGillespie Apr 2, 2021
5a74b53
Add JavaDocs to QueryOrderBy
TimothyGillespie Apr 2, 2021
5210447
Add JavaDocs to QueryOrderByElement
TimothyGillespie Apr 2, 2021
3bff425
Add JavaDocs to the order method on Query
TimothyGillespie Apr 2, 2021
e88bd3f
Merge pull request #21 from JavaWebStack/TimothyGillespie/addOrderByT…
TimothyGillespie Apr 2, 2021
289aa8a
Removed manual migrations
JanHolger Apr 27, 2021
f6a1498
Merge pull request #24 from JavaWebStack/TimothyGillespie/enableMulti…
JanHolger Apr 27, 2021
a74ab07
Merge remote-tracking branch 'origin/master' into maintenance
JanHolger Apr 27, 2021
e241a39
Merge remote-tracking branch 'origin/maintenance' into maintenance
JanHolger Apr 27, 2021
54ad3d7
Removed injector
JanHolger Apr 28, 2021
6d2ed0c
Add script to start database docker container
TimothyGillespie Apr 28, 2021
5c11dbe
Fill OnlyIdModel
TimothyGillespie Apr 28, 2021
a770745
Add Getter to OnlyIdModel
TimothyGillespie Apr 28, 2021
2c5365c
Add order by query execution test
TimothyGillespie Apr 28, 2021
d464bc9
Change query building tests appropriately
TimothyGillespie Apr 28, 2021
1e9baf4
Fix minor issues
TimothyGillespie Apr 28, 2021
335f633
Convert column names to snake case
TimothyGillespie Apr 28, 2021
f52c9e3
Revert "Convert column names to snake case"
TimothyGillespie Apr 30, 2021
09dcc4c
Correct spelling mistake in class name
TimothyGillespie Apr 30, 2021
e625333
Add test for overwritten column names
TimothyGillespie Apr 30, 2021
2e35155
Adjust tests to reflect non snake case of non existant columns
TimothyGillespie Apr 30, 2021
15db24b
Fix order by naming bug
TimothyGillespie Apr 30, 2021
912bd78
Address sonar cube concerns
TimothyGillespie Apr 30, 2021
ad1c2d6
Merge pull request #26 from JavaWebStack/TimothyGillespie/lookAtOrderBy
JanHolger May 12, 2021
e7fa451
Merge remote-tracking branch 'origin/master' into maintenance
JanHolger May 28, 2021
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
Merge remote-tracking branch 'origin/master' into maintenance
  • Loading branch information
JanHolger committed May 28, 2021
commit e7fa45147ca8ef044e7de56d4afcaf00ccb1e6ce

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.