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.

Sign up for GitHub

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

Jump to bottom

Updated insertMulti #775

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Updated insertMulti #775

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
40774e7
Updated insertMulti
LunarDevelopment Jul 19, 2018
597b134
Updated to acomodate insert ignore with multi
LunarDevelopment Jul 19, 2018
a955cf7
Woops, removed some redundant lines.
LunarDevelopment Jul 19, 2018
f608e43
Sorted return type
LunarDevelopment Jul 20, 2018
ababc3a
Is that one right.. ?
LunarDevelopment Jul 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 15 additions & 11 deletions MysqliDb.php
View file
Open in desktop
Expand Up @@ -779,34 +779,38 @@ public function insertMulti($tableName, array $multiInsertData, array $dataKeys
// only auto-commit our inserts, if no transaction is currently running
$autoCommit = (isset($this->_transaction_in_progress) ? !$this->_transaction_in_progress : true);
$ids = array();

$options = [
Copy link
Collaborator

Choose a reason for hiding this comment

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

Please use old Array() syntax since we still support old php version

'_queryOptions' => $this->_queryOptions,
'_nestJoin' => $this->_nestJoin,
'_forUpdate' => $this->_forUpdate,
'_lockInShareMode' => $this->_lockInShareMode
];
if($autoCommit) {
$this->startTransaction();
}

foreach ($multiInsertData as $insertData) {
if($dataKeys !== null) {
// apply column-names if given, else assume they're already given in the data
$insertData = array_combine($dataKeys, $insertData);
}

foreach ($options as $k => $v) {
$this->${'k'} = $v;
}
$id = $this->insert($tableName, $insertData);
if(!$id) {
if($autoCommit) {
if(!$id ) {
if($autoCommit && !in_array('IGNORE', $options['_queryOptions'])) {
$this->rollback();
}
return false;
$id = false;
Copy link
Collaborator

Choose a reason for hiding this comment

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

this still should be return false; plus previous comments are not addressed

}
$ids[] = $id;
}

}
if($autoCommit) {
$this->commit();
}

}
return $ids;
}

Copy link
Collaborator

Choose a reason for hiding this comment

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

please remove all whitespace changes

/**
* Replace method to add new row
*
Expand Down