Allow newline chars in CSV headers in MySQL Import service #3719
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 5 commits
November 30, 2021 15:23
The changes in this commit ensure that were not just ignoring the first line of the header row, but instead the entire header row.
dafeder
requested changes
Jan 15, 2022
modules/datastore/modules/datastore_mysql_import/src/Service/MysqlImport.php
Outdated
Show resolved
Hide resolved
modules/datastore/modules/datastore_mysql_import/src/Service/MysqlImport.php
Outdated
Show resolved
Hide resolved
| // Call `count` on database table in order to ensure a database table has | ||
| // been created for the datastore. | ||
| // @todo Find a better way to ensure creation of datastore tables. | ||
| $this->dataStorage->count(); | ||
| // Construct and execute a SQL import statement using the information | ||
| // gathered from the CSV file being imported. | ||
| $this->getDatabaseConnectionCapableOfDataLoad()->query( | ||
| $this->getSqlStatement($file_path, $this->dataStorage->getTableName(), $headers, $eol)); | ||
| $this->getSqlStatement($file_path, $this->dataStorage->getTableName(), $headers, $eol, $header_line_count)); |
There was a problem hiding this comment.
Suggested change
| $this->getSqlStatement($file_path, $this->dataStorage->getTableName(), $headers, $eol, $header_line_count)); | |
| $this->getSqlStatement($file_path, $headers, $eol, $header_line_count)); |
CodeClimate's complaining about too many arguments, and this can be done inside the method.
modules/datastore/modules/datastore_mysql_import/src/Service/MysqlImport.php
Show resolved
Hide resolved
Co-authored-by: Dan Feder <dan.feder@civicactions.com>
dafeder
approved these changes
Jan 18, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fixes WCMS-7337
QA Steps