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

[Ref] [Import] Add extra functions to DataSource #23344

Merged
merged 1 commit into from
May 4, 2022

Conversation

eileenmcnaughton
Copy link
Contributor

@eileenmcnaughton eileenmcnaughton commented May 3, 2022

Overview

Add extra functions to DataSource

Before

The functions that multiple cleanups rely on keep causing PR conflicts

After

This adds functions from #23292 to
the DataSource class (without them being called as yet)

  • part of trying to get to the point where fixes are not dependent on each other

Technical Details

These functions are not called - except for one which is slightly refactored but in tested code

Comments

\

@civibot
Copy link

civibot bot commented May 3, 2022

(Standard links)

@civibot civibot bot added the master label May 3, 2022
@eileenmcnaughton eileenmcnaughton changed the title Add extra functions to DataSource [Ref] [Import] Add extra functions to DataSource May 3, 2022
@eileenmcnaughton
Copy link
Contributor Author

test this please

if ($limit) {
$query .= ' LIMIT ' . $limit . ($offset ? (' OFFSET ' . $offset) : NULL);
}
public function getRows(bool $nonAssociative = TRUE): array {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Function was only just added so we can change the signature - only one call to it now - https://github.com/civicrm/civicrm-core/pull/23263/files#diff-4f0a1c0d1f7a02c448ebe273bd5b951a1811dd14949b11b9c8914b2c198fcebaR384

@eileenmcnaughton eileenmcnaughton force-pushed the import_functions branch 2 times, most recently from 59c4a2c to a518d6f Compare May 3, 2022 23:20
This adds functions from civicrm#23292 to
the DataSource class (without them being called as yet)

- part of trying to get to the point where fixes are not dependent on each other
@eileenmcnaughton
Copy link
Contributor Author

test this please

@colemanw
Copy link
Member

colemanw commented May 4, 2022

Looks good.

@colemanw colemanw merged commit 5d11856 into civicrm:master May 4, 2022
@colemanw colemanw deleted the import_functions branch May 4, 2022 18:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants