From 241049763bedfeeef29e62c7c5b8698dd7fc4a7f Mon Sep 17 00:00:00 2001
From: Alfonso Martinez <alfonso@tinybird.co>
Date: Wed, 26 Oct 2022 11:50:45 +0200
Subject: [PATCH] Fixed failing tests

---
 src/Functions/FunctionsJSON.cpp                 | 17 ++++++++++++++---
 .../02473_extract_low_cardinality_from_json.sql |  1 -
 ...2474_extract_fixedstring_from_json.reference | 10 ++++++++++
 .../02474_extract_fixedstring_from_json.sql     |  8 ++++++++
 4 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 tests/queries/0_stateless/02474_extract_fixedstring_from_json.reference
 create mode 100644 tests/queries/0_stateless/02474_extract_fixedstring_from_json.sql

diff --git a/src/Functions/FunctionsJSON.cpp b/src/Functions/FunctionsJSON.cpp
index 9e44de2cb52..d0fd6e2397c 100644
--- a/src/Functions/FunctionsJSON.cpp
+++ b/src/Functions/FunctionsJSON.cpp
@@ -1330,12 +1330,23 @@ public:
     // We use insertResultToFixedStringColumn in case we are inserting raw data in a FixedString column
     static bool insertResultToFixedStringColumn(IColumn & dest, const Element & element, std::string_view)
     {
-        ColumnFixedString & col_str = assert_cast<ColumnFixedString &>(dest);
-        auto & chars = col_str.getChars();
+        ColumnFixedString::Chars chars;
         WriteBufferFromVector<ColumnFixedString::Chars> buf(chars, AppendModeTag());
         traverse(element, buf);
         buf.finalize();
-        col_str.insertDefault();
+
+        auto & col_str = assert_cast<ColumnFixedString &>(dest);
+
+        if (chars.size() > col_str.getN())
+            return false;
+
+        chars.push_back(0);
+        std::string str = reinterpret_cast<const char *>(chars.data());
+
+        auto padded_str = str + std::string(col_str.getN() - std::min(col_str.getN(), str.length()), '\0');
+        col_str.insertData(str.data(), str.size());
+
+
         return true;
     }
 
diff --git a/tests/queries/0_stateless/02473_extract_low_cardinality_from_json.sql b/tests/queries/0_stateless/02473_extract_low_cardinality_from_json.sql
index c9810c77720..0a0ae398227 100644
--- a/tests/queries/0_stateless/02473_extract_low_cardinality_from_json.sql
+++ b/tests/queries/0_stateless/02473_extract_low_cardinality_from_json.sql
@@ -1,3 +1,2 @@
--- Tags: no-fasttest
 SELECT JSONExtract('{"a" : {"b" : {"c" : 1, "d" : "str"}}}', 'Tuple( a LowCardinality(String), b LowCardinality(String), c LowCardinality(String), d LowCardinality(String))');
 SELECT JSONExtract('{"a" : {"b" : {"c" : 1, "d" : "str"}}}', 'Tuple( a String, b LowCardinality(String), c LowCardinality(String), d LowCardinality(String))');
\ No newline at end of file
diff --git a/tests/queries/0_stateless/02474_extract_fixedstring_from_json.reference b/tests/queries/0_stateless/02474_extract_fixedstring_from_json.reference
new file mode 100644
index 00000000000..783d12fcf1a
--- /dev/null
+++ b/tests/queries/0_stateless/02474_extract_fixedstring_from_json.reference
@@ -0,0 +1,10 @@
+\0\0\0\0\0\0\0\0\0\0\0
+{"a":123456}
+\0\0\0\0\0
+123456
+\0\0\0\0\0
+123456
+\0\0\0\0\0
+\0\0\0\0\0
+131231
+131231
diff --git a/tests/queries/0_stateless/02474_extract_fixedstring_from_json.sql b/tests/queries/0_stateless/02474_extract_fixedstring_from_json.sql
new file mode 100644
index 00000000000..cfc47e00cba
--- /dev/null
+++ b/tests/queries/0_stateless/02474_extract_fixedstring_from_json.sql
@@ -0,0 +1,8 @@
+SELECT JSONExtract('{"a": 123456}', 'FixedString(11)');
+SELECT JSONExtract('{"a": 123456}', 'FixedString(12)');
+SELECT JSONExtract('{"a": "123456"}', 'a', 'FixedString(5)');
+SELECT JSONExtract('{"a": "123456"}', 'a', 'FixedString(6)');
+SELECT JSONExtract('{"a": 123456}', 'a', 'FixedString(5)');
+SELECT JSONExtract('{"a": 123456}', 'a', 'FixedString(6)');
+SELECT JSONExtract(materialize('{"a": 131231}'), 'a', 'LowCardinality(FixedString(5))') FROM numbers(2);
+SELECT JSONExtract(materialize('{"a": 131231}'), 'a', 'LowCardinality(FixedString(6))') FROM numbers(2);