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

Fixed #532 - Implemented onlyQuoteStrings #534

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

Fixed #532 - Implemented onlyQuoteStrings #534

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9850683
Fixed #532 - Implemented onlyQuoteStrings
boldt Jul 6, 2018
1d247a2
Refactor variable srt to value
boldt Jul 6, 2018
2c9b709
Added doc for the onlyQuoteStrings property
boldt Jul 6, 2018
1c06fa7
Undo local test environment changes.
boldt Jul 6, 2018
89a3c88
Whitespace
boldt Jul 6, 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
16 changes: 15 additions & 1 deletion papaparse.js
View file
Open in desktop
Expand Up @@ -280,6 +280,9 @@
/** quote character */
var _quoteChar = '"';

/** quote character */
var _onlyQuoteStrings = false;

unpackConfig();

var quoteCharRegex = new RegExp(_quoteChar, 'g');
Expand Down Expand Up @@ -343,6 +346,11 @@

if (typeof _config.header === 'boolean')
_writeHeader = _config.header;

if (typeof _config.onlyQuoteStrings === 'boolean') {
_onlyQuoteStrings = _config.onlyQuoteStrings;
_quotes = false; // Override quotes, since only quote strings is selected
}
}


Expand Down Expand Up @@ -412,9 +420,15 @@
if (str.constructor === Date)
return JSON.stringify(str).slice(1, 25);

// We must check, whether the data type is string already here,
// since all data types are converted into strings in the next line
var onlyQuoteStrings = _onlyQuoteStrings && typeof str === 'string';
Copy link
Collaborator

Choose a reason for hiding this comment

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

I think we should rename str into value here to make code clearer.


// Converts every data type to string
str = str.toString().replace(quoteCharRegex, _quoteChar + _quoteChar);

var needsQuotes = (typeof _quotes === 'boolean' && _quotes)
var needsQuotes = onlyQuoteStrings
|| (typeof _quotes === 'boolean' && _quotes)
|| (_quotes instanceof Array && _quotes[col])
|| hasAny(str, Papa.BAD_DELIMITERS)
|| str.indexOf(_delimiter) > -1
Expand Down
12 changes: 12 additions & 0 deletions tests/test-cases.js
View file
Open in desktop
Expand Up @@ -1451,6 +1451,18 @@ var UNPARSE_TESTS = [
config: { quotes: [true, false, true] },
expected: '"Col1",Col2,"Col3"\r\n"a",b,"c"\r\n"d",e,"f"'
},
{
description: "Force quotes around string fields only",
input: [['a', 'b', 'c'], ['d', 10, true]],
config: { onlyQuoteStrings: true },
expected: '"a","b","c"\r\n"d",10,true'
},
{
description: "Force quotes around string fields only (with header row)",
input: [{ "Col1": "a", "Col2": "b", "Col3": "c" }, { "Col1": "d", "Col2": 10, "Col3": true }],
config: { onlyQuoteStrings: true },
expected: '"Col1","Col2","Col3"\r\n"a","b","c"\r\n"d",10,true'
},
{
description: "Empty input",
input: [],
Expand Down