Skip to content
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.

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

Fix prepared statement setNull() #1365 #1371

Conversation

speckyspooky
Copy link
Contributor

Fix prepared statement setNull() #1365

@speckyspooky
Copy link
Contributor Author

@merks
Hi there today I have a problem with the build process on jenkins side.
You fixed the a mylin issue with #1367 to correct the build process on Jenkin side I get a familiar issue.
I'm wondering because your last bult was running and also my production merge.

The jenkins error message are:

jenkins-error2

jenkins-error

Could you please assist here again. Thanks in advance.

@speckyspooky speckyspooky added this to the 4.14 milestone Jul 15, 2023
@speckyspooky speckyspooky self-assigned this Jul 15, 2023
@merks
Copy link
Contributor

merks commented Jul 15, 2023

The error suggests you are using an older version of the target platform in the build, i.e., comparing before and after the fix I did:

image

I'm going to rebase your branch:

image

That should start a new build with the latest version of the target platform.

@merks merks force-pushed the Fix_prepared_statement_isnull_1365 branch from 5a72947 to 78e9020 Compare July 15, 2023 14:12
@merks
Copy link
Contributor

merks commented Jul 15, 2023

Note that any other PRs you started before the target platform was fixed will need to be rebased if you need to build them again...

@speckyspooky
Copy link
Contributor Author

Sorry, I'm didn't understand the issue because I checked in the "Statement.class" and before I pushed all changes fro birt-master-branche into my folk.
Yes, I see in your screen that my version is an older and not corresponding to your fix. But I'm confused because realy I thought with the merge from master to my folk to my branch I have the latest version.

@speckyspooky
Copy link
Contributor Author

But you are right I created the new local branch before your fix was bushed and after your push I refreshed.
If I understand you then it isn't enough to start only a change refresh from the master-branch in this case.

@merks
Copy link
Contributor

merks commented Jul 15, 2023

I'm not such a great Git expert. I personally try to ensure I have master checked out and pulled. Then I create my branch, commit, and push to my fork as the remote. I avoid working on more than one PR at a time. I'm not sure how to manually rebase after master has diverged. My poor man's approach is to rename the branch. Check out master and pull. Create a new branch with the same name as I used before. Cherry pick the change from the renamed branch on the newly-created branch, and force push to my fork. I'm sure there's a better way. 😱

@speckyspooky speckyspooky merged commit 1cc5c32 into eclipse-birt:master Jul 15, 2023
3 checks passed
@speckyspooky speckyspooky added the BugFix Change to correct issues label Aug 6, 2023
@speckyspooky speckyspooky deleted the Fix_prepared_statement_isnull_1365 branch March 28, 2024 20:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
BugFix Change to correct issues
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants