diff --git a/CHANGELOG b/CHANGELOG index 6561e91753..03cd357c03 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ devel ----- +* fixed issue #2367 + * added "bindVars" to attributes of currently running and slow queries * added "jsonl" as input file type for arangoimp diff --git a/arangosh/Import/ImportHelper.cpp b/arangosh/Import/ImportHelper.cpp index 1feea0da81..5707eb8ae2 100644 --- a/arangosh/Import/ImportHelper.cpp +++ b/arangosh/Import/ImportHelper.cpp @@ -576,7 +576,9 @@ void ImportHelper::addField(char const* field, size_t fieldLength, size_t row, } else { if (IsInteger(field, fieldLength) || IsDecimal(field, fieldLength)) { // numeric value. don't convert + _lineBuffer.appendChar('"'); _lineBuffer.appendText(field, fieldLength); + _lineBuffer.appendChar('"'); } else { // non-numeric value _lineBuffer.appendJsonEncoded(field, fieldLength); diff --git a/js/client/modules/@arangodb/testing.js b/js/client/modules/@arangodb/testing.js index a0e2fc7ada..9eea58a07a 100644 --- a/js/client/modules/@arangodb/testing.js +++ b/js/client/modules/@arangodb/testing.js @@ -3234,7 +3234,7 @@ const impTodos = [{ type: 'csv', create: 'true', separator: ',', - convert: true, + convert: false, backslash: true }, { id: 'csvnoeol', diff --git a/js/server/tests/import/import.js b/js/server/tests/import/import.js index 214b29bc67..b80002fed8 100644 --- a/js/server/tests/import/import.js +++ b/js/server/tests/import/import.js @@ -291,26 +291,26 @@ function importTestSuite () { testCsvImportNoConvert : function () { var expected = [ - { value1: 1 }, - { value1: 2, value2: false }, - { value1: 3, value2: true }, - { value1: 4, value2: 1 }, - { value1: 5, value2: 2 }, - { value1: 6, value2: 3 }, - { value1: 7, value2: "a" }, - { value1: 8, value2: "b" }, - { value1: 9, value2: " a" }, - { value1: 10, value2: -1 }, - { value1: 11, value2: -0.5 }, - { value1: 12, value2: 3.566 }, - { value1: 13, value2: 0 }, - { value1: 14 }, - { value1: 15, value2: " c" }, - { value1: 16, value2: " 1" } + { value1: "1" }, + { value1: "2", value2: false }, + { value1: "3", value2: true }, + { value1: "4", value2: "1" }, + { value1: "5", value2: "2" }, + { value1: "6", value2: "3" }, + { value1: "7", value2: "a" }, + { value1: "8", value2: "b" }, + { value1: "9", value2: " a" }, + { value1: "10", value2: "-1" }, + { value1: "11", value2: "-.5" }, + { value1: "12", value2: "3.566" }, + { value1: "13", value2: "0" }, + { value1: "14" }, + { value1: "15", value2: " c" }, + { value1: "16", value2: " 1" } ]; - var actual = getQueryResults("FOR i IN UnitTestsImportCsvNoConvert SORT i.value1 RETURN i"); - assertEqual(expected, actual); + var actual = getQueryResults("FOR i IN UnitTestsImportCsvNoConvert SORT TO_NUMBER(i.value1) RETURN i"); + assertEqual(JSON.stringify(expected), JSON.stringify(actual)); }, ////////////////////////////////////////////////////////////////////////////////