LPS-129972 Simplify DSLQuery CustomSQL interactions #9917

Preston-Crary · 2021-04-01T18:09:10Z

No description provided.

…d by LPS-113508(8ed09f2)

liferay-continuous-integration · 2021-04-01T18:09:14Z

To conserve resources, the PR Tester does not automatically run for every pull.

If your code changes were already tested in another pull, reference that pull in this pull so the test results can be analyzed.

If your pull was never tested, comment "ci:test" to run the PR Tester for this pull.

Preston-Crary · 2021-04-01T18:09:23Z

ci:test:relevant

Preston-Crary · 2021-04-01T18:09:29Z

ci:test:sf

liferay-continuous-integration · 2021-04-01T18:14:15Z

✔️ ci:test:sf - 1 out of 1 jobs passed in 4 minutes

Click here for more details.

Base Branch:

Branch Name: master
Branch GIT ID: 42d9112dbe2ba3e15d3b17d57485bcc3104d48ef

Sender Branch:

Branch Name: LPS-129972
Branch GIT ID: 5c43361730286e222f9ba062291231a102bb9887

1 out of 1jobs PASSED

1 Successful Jobs:

test-portal-source-format

For more details click here.

liferay-continuous-integration · 2021-04-01T23:17:48Z

✔️ ci:test:stable - 9 out of 9 jobs passed

❌ ci:test:relevant - 23 out of 28 jobs passed in 5 hours 3 minutes

Click here for more details.

Base Branch:

Branch Name: master
Branch GIT ID: 42d9112dbe2ba3e15d3b17d57485bcc3104d48ef

Upstream Comparison:

Branch GIT ID: 42d9112dbe2ba3e15d3b17d57485bcc3104d48ef
Jenkins Build URL: Acceptance Upstream DXP (master) #1712

ci:test:stable - 9 out of 9 jobs PASSED

9 Successful Jobs:

ci:test:relevant - 23 out of 28 jobs PASSED

5 Failed Jobs:

23 Successful Jobs:

For more details click here.

Failures unique to this pull:

test-portal-acceptance-pullrequest-batch(master)/functional-tomcat90-mysql57-jdk8/2
Job Results:
51 Tests Passed.
1 Test Failed.
1. AXIS_VARIABLE=2,label_exp=!master #418646
  1. LocalFile.CommerceFrontStore#ViewStoreFrontSimpleProduct - Poshi Report - Poshi Summary - Console Output

Failures in common with acceptance upstream results at 42d9112:

test-portal-acceptance-pullrequest-batch(master)/modules-integration-mysql57-jdk8/0
Job Results:
10 Tests Passed.
0 Tests Failed.
1. AXIS_VARIABLE=4,label_exp=!master #429919
  Build was aborted
test-portal-acceptance-pullrequest-batch(master)/functional-tomcat90-mysql57-jdk8/0
Job Results:
116 Tests Passed.
1 Test Failed.
1. AXIS_VARIABLE=8,label_exp=!master #458295
  1. LocalFile.AppBuilder#PredefinedValuesArePersistedInFormView - Poshi Report - Poshi Summary - Console Output
test-portal-acceptance-pullrequest-batch(master)/functional-tomcat90-mysql57-jdk8/1
Job Results:
58 Tests Passed.
2 Tests Failed.
1. AXIS_VARIABLE=2,label_exp=!master #353890
  1. LocalFile.CPCommerceOrders#EditOrderCheckingOutViaOrderDetails - Poshi Report - Poshi Summary - Console Output
2. AXIS_VARIABLE=22,label_exp=!master #353890
  1. LocalFile.CommerceAccelerators#DeactivateCommerceAccountAdminLogOut - Poshi Report - Poshi Summary - Console Output
test-portal-acceptance-pullrequest-batch(master)/functional-tomcat90-mysql57-jdk8/2
Job Results:
51 Tests Passed.
2 Tests Failed.
1. AXIS_VARIABLE=0,label_exp=!master #418646
  1. LocalFile.CommerceAccelerators#MiniumSiteFullFlowCheckingOutViaOrderDetails - Poshi Report - Poshi Summary - Console Output
2. AXIS_VARIABLE=1,label_exp=!master #418646
  1. LocalFile.CommerceAccelerators#SpeedwellSiteFullFlow - Poshi Report - Poshi Summary - Console Output

shuyangzhou · 2021-04-02T00:36:05Z

...tom-sql-impl/src/main/java/com/liferay/portal/dao/orm/custom/sql/internal/CustomSQLImpl.java

+		BiFunction<Expression<String>, String, Predicate> operatorBiFunction,
+		String[] values) {
+
+		if ((values != null) && (values.length == 0)) {


@Preston-Crary do you mean if ((values == null) || (values.length == 0)) { here? Because by the current logic, if values is null, you will get a NPE at 40e9e66#diff-39eafb03fec7101df60be56569e519a5d70deac7b42d146d6bc636ee90917554R231

Yes, I'll fix and resend. I think I copied that over from replaceKeywords() and didn't fully update it. Thanks!

Preston-Crary · 2021-04-02T16:48:06Z

Please see #9920

brianchandotcom and others added 30 commits March 31, 2021 04:55

artifact:ignore portal-web 5.0.8 releng

e43f3f7

build.gradle auto SF

6c387e7

ant build-lib-versions Regen

e3e8bd2

artifact:ignore bookmarks-web 5.0.1 change log

a873b6e

artifact:ignore bookmarks-web 5.0.1 prep next

44f5573

artifact:ignore bookmarks-web 5.0.1 artifact properties

17c6459

artifact:ignore knowledge-base-web 5.0.1 change log

2d70cb4

artifact:ignore knowledge-base-web 5.0.1 prep next

38445d5

artifact:ignore knowledge-base-web 5.0.1 artifact properties

b715a9b

artifact:ignore message-boards-web 5.0.2 change log

3418a06

artifact:ignore message-boards-web 5.0.2 prep next

18b0725

artifact:ignore message-boards-web 5.0.2 artifact properties

8362dba

artifact:ignore organizations-service 4.0.3 change log

4a05106

artifact:ignore organizations-service 4.0.3 prep next

7d6d777

artifact:ignore organizations-service 4.0.3 artifact properties

c64570b

artifact:ignore portal-vulcan-impl 5.0.2 change log

38138f8

artifact:ignore portal-vulcan-impl 5.0.2 prep next

cc45ac0

artifact:ignore portal-vulcan-impl 5.0.2 artifact properties

80c2887

artifact:ignore segments-service 3.0.1 change log

db54488

artifact:ignore segments-service 3.0.1 prep next

887624c

artifact:ignore segments-service 3.0.1 artifact properties

5946cc0

artifact:ignore segments-web 3.0.1 change log

0d21235

artifact:ignore segments-web 3.0.1 prep next

e21b55c

artifact:ignore segments-web 3.0.1 artifact properties

07e0919

build.gradle auto SF

1b4f7db

artifact:ignore saml-opensaml-integration 5.0.1 change log

dedb937

artifact:ignore saml-opensaml-integration 5.0.1 prep next

4ee94fb

artifact:ignore saml-opensaml-integration 5.0.1 artifact properties

7003bce

build.gradle auto SF

091ec8c

LRQA-66262 Add a test to publish publication with display template

663856c

austinchiang and others added 13 commits April 1, 2021 08:11

LPS-129485 Use spaces when order matters

5278310

LPS-129128 Add folder through JSON

e566ed1

LPS-129930 Remove dependecies, as corresponding usage had been remove…

07803af

…d by LPS-113508(8ed09f2)

LPS-129930 Remove dependecy as it is not used

2a45153

LPS-129930 Remove unused dependencies for unit tests

208d0f3

LPS-77699 Update Translations

fd6a7fd

LPS-129972 API to simplify combining 2 optional predicates.

1f95b0f

LPS-129972 Versioning.

aa1e7ed

LPS-129972 Complete test coverage.

00ed57c

LPS-129972 Created CustomSQL API to help with keyword predicates.

40e9e66

LPS-129972 Needed for ProviderType.

e1991d1

LPS-129972 Versioning.

6313756

LPS-129972 Update usages.

5c43361

liferay-continuous-integration added ci:test:sf - pending ci:test:sf - success and removed ci:test:sf - pending labels Apr 1, 2021

liferay-continuous-integration added ci:test:relevant - pending ci:test:stable - pending ci:test:relevant - failure ci:test:stable - success and removed ci:test:relevant - pending ci:test:stable - pending labels Apr 1, 2021

shuyangzhou reviewed Apr 2, 2021

View reviewed changes

Preston-Crary closed this Apr 2, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

LPS-129972 Simplify DSLQuery CustomSQL interactions #9917

LPS-129972 Simplify DSLQuery CustomSQL interactions #9917

Preston-Crary commented Apr 1, 2021

liferay-continuous-integration commented Apr 1, 2021

Preston-Crary commented Apr 1, 2021

Preston-Crary commented Apr 1, 2021

liferay-continuous-integration commented Apr 1, 2021

Base Branch:

Sender Branch:

For more details click here.

liferay-continuous-integration commented Apr 1, 2021

Base Branch:

Upstream Comparison:

5 Failed Jobs:

For more details click here.

Failures unique to this pull:

test-portal-acceptance-pullrequest-batch(master)/functional-tomcat90-mysql57-jdk8/2

Job Results:

test-portal-acceptance-pullrequest-batch(master)/modules-integration-mysql57-jdk8/0

Job Results:

test-portal-acceptance-pullrequest-batch(master)/functional-tomcat90-mysql57-jdk8/0

Job Results:

test-portal-acceptance-pullrequest-batch(master)/functional-tomcat90-mysql57-jdk8/1

Job Results:

test-portal-acceptance-pullrequest-batch(master)/functional-tomcat90-mysql57-jdk8/2

Job Results:

shuyangzhou Apr 2, 2021

Preston-Crary Apr 2, 2021

Preston-Crary commented Apr 2, 2021

LPS-129972 Simplify DSLQuery CustomSQL interactions #9917

LPS-129972 Simplify DSLQuery CustomSQL interactions #9917

Conversation

Preston-Crary commented Apr 1, 2021

liferay-continuous-integration commented Apr 1, 2021

Preston-Crary commented Apr 1, 2021

Preston-Crary commented Apr 1, 2021

liferay-continuous-integration commented Apr 1, 2021

✔️ ci:test:sf - 1 out of 1 jobs passed in 4 minutes

Base Branch:

Sender Branch:

For more details click here.

liferay-continuous-integration commented Apr 1, 2021

✔️ ci:test:stable - 9 out of 9 jobs passed

❌ ci:test:relevant - 23 out of 28 jobs passed in 5 hours 3 minutes

Base Branch:

Upstream Comparison:

5 Failed Jobs:

For more details click here.

Failures unique to this pull:

test-portal-acceptance-pullrequest-batch(master)/functional-tomcat90-mysql57-jdk8/2

Job Results:

test-portal-acceptance-pullrequest-batch(master)/modules-integration-mysql57-jdk8/0

Job Results:

test-portal-acceptance-pullrequest-batch(master)/functional-tomcat90-mysql57-jdk8/0

Job Results:

test-portal-acceptance-pullrequest-batch(master)/functional-tomcat90-mysql57-jdk8/1

Job Results:

test-portal-acceptance-pullrequest-batch(master)/functional-tomcat90-mysql57-jdk8/2

Job Results:

shuyangzhou Apr 2, 2021

Choose a reason for hiding this comment

Preston-Crary Apr 2, 2021

Choose a reason for hiding this comment

Preston-Crary commented Apr 2, 2021