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

Update DB_Object #280

Merged
merged 16 commits into from
Jan 3, 2020
Merged

Update DB_Object #280

merged 16 commits into from
Jan 3, 2020

Conversation

eileenmcnaughton
Copy link
Contributor

No description provided.

seamuslee001 and others added 3 commits January 3, 2020 15:16
…4476 (also txt from svn days): Extend CaseType API to return/save XML

This appears to be tested although reading the code it seems like it should not be required.
Used in case Types

m
@civibot
Copy link

civibot bot commented Jan 3, 2020

(Standard links)

@civibot civibot bot added the master label Jan 3, 2020
DB/common.php Outdated
@@ -1161,6 +1161,16 @@ function modifyQuery($query)
$e = new \Civi\Core\Event\QueryEvent($query);
Civi::$statics['db_common_dispatcher']->dispatch('civi.db.query', $e);
return $e->query;

Copy link
Contributor

Choose a reason for hiding this comment

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

@eileenmcnaughton i believe that this was an earlier version of what is in the lines above

Copy link
Contributor

Choose a reason for hiding this comment

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

DB/common.php Outdated
@@ -2264,6 +2274,9 @@ function _convertNullArrayValuesToEmpty(&$array)
}
}

function lastInsertId() {
Copy link
Contributor

Choose a reason for hiding this comment

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

I believe this is a duplicate of L2288 (a modification of the patch included in #276

xurizaemon and others added 6 commits January 3, 2020 16:12
…n CIVICRM_DEBUG_LOG_QUERY is on

CRM-18093 extend query time logging with string for grepping

CRM-18093 More query debug info and a separate log file
…adlock is met.

This is restoring previous functionality broken when we meddled with deadlocks.

Improve deadlock error handling

m
…r PHP 7.3

PHP 7.3 has started to issue warnings when a continue statement is
inside a switch and interpreted as a break
  "continue" targeting switch is equivalent to "break".
  Did you mean to use "continue 2"?
In this case, the switch statement was weird anyway, so I've
replaced it with a couple of if statements to do the same thing.
@seamuslee001
Copy link
Contributor

I'm going to treat this as a reviewers cut so merging

@seamuslee001 seamuslee001 merged commit 110a9da into civicrm:master Jan 3, 2020
@eileenmcnaughton
Copy link
Contributor Author

@seamuslee001 yes I'm happy with that - it was a bit of a slog to do but we both reached the same conclusion so yay

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.

6 participants