From 9a5dcd23ace45d28ece183b1756751a0fa72591b Mon Sep 17 00:00:00 2001
From: nmcdonnell-kx <nmcdonnell@kx.com>
Date: Thu, 24 Aug 2023 18:41:19 +0100
Subject: [PATCH] Fix the null mapping tests from
 https://github.com/KxSystems/arrowkdb/pull/34

---
 tests/null_mapping/null_mapping_float.t | 28 +++++++++++++++++--------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/tests/null_mapping/null_mapping_float.t b/tests/null_mapping/null_mapping_float.t
index 85628cd..1b6e954 100644
--- a/tests/null_mapping/null_mapping_float.t
+++ b/tests/null_mapping/null_mapping_float.t
@@ -35,15 +35,25 @@ float_schema:.arrowkdb.sc.schema[(ts_fd,f32_fd,f64_fd,dec_fd)];
 -1"\n+----------|| Create data for each column in the table ||----------+\n";
 ts_data:asc N?0p;
 
-f32_data:(N?100e),0Ne;
+f32_data:(N?100e);
 f32_data[0]:1.23e;
-f64_data:(N?100f),0n;
+f64_data:(N?100f);
 f64_data[1]:4.56f;
-dec_data:{"F"$.Q.f[2]x} each (N?(10f)),0n
+dec_data:{"F"$.Q.f[2]x} each (N?(10f));
 dec_data[2]:7.89f
 
+ts_data_null:asc (N+1)?0p;
+
+f32_data_null:(N?100e),0Ne;
+f32_data_null[0]:1.23e;
+f64_data_null:(N?100f),0n;
+f64_data_null[1]:4.56f;
+dec_data_null:{"F"$.Q.f[2]x} each (N?(10f)),0n
+dec_data_null[2]:7.89f
+
 -1"\n+----------|| Combine the data for all columns ||----------+\n";
 float_data:(ts_data;f32_data;f64_data;dec_data);
+float_data_null:(ts_data_null;f32_data_null;f64_data_null;dec_data_null);
 
 -1"\n+----------|| Write the schema and array data to a parquet file ||----------+\n";
 options[`DECIMAL128_AS_DOUBLE]:1
@@ -54,7 +64,7 @@ options_null[`PARQUET_VERSION]:`V2.0
 parquet_float:"null_mapping_float.parquet";
 parquet_float_null:"null_mapping_float_null.parquet";
 .arrowkdb.pq.writeParquet[parquet_float;float_schema;float_data;options];
-.arrowkdb.pq.writeParquet[parquet_float_null;float_schema;float_data;options_null];
+.arrowkdb.pq.writeParquet[parquet_float_null;float_schema;float_data_null;options_null];
 
 -1"\n+----------|| Read the schema back and compare ||----------+\n";
 parquet_float_schema:.arrowkdb.pq.readParquetSchema[parquet_float];
@@ -63,9 +73,9 @@ float_schema~parquet_float_schema
 
 -1"\n+----------|| Read the array data back and compare ||----------+\n";
 parquet_float_data:.arrowkdb.pq.readParquetData[parquet_float;options];
-parquet_float_data_null:.arrowkdb.pq.readParquetData[parquet_float;options_null];
+parquet_float_data_null:.arrowkdb.pq.readParquetData[parquet_float_null;options_null];
 float_data~parquet_float_data
-float_data~parquet_float_data_null
+float_data_null~parquet_float_data_null
 rm parquet_float;
 rm parquet_float_null;
 
@@ -73,7 +83,7 @@ rm parquet_float_null;
 arrow_float:"null_mapping_float.arrow";
 arrow_float_null:"null_mapping_float_null.arrow";
 .arrowkdb.ipc.writeArrow[arrow_float;float_schema;float_data;options];
-.arrowkdb.ipc.writeArrow[arrow_float_null;float_schema;float_data;options_null];
+.arrowkdb.ipc.writeArrow[arrow_float_null;float_schema;float_data_null;options_null];
 
 -1"\n+----------|| Read the schema back and compare ||----------+\n";
 arrow_float_schema:.arrowkdb.ipc.readArrowSchema[arrow_float];
@@ -82,9 +92,9 @@ float_schema~arrow_float_schema
 
 -1"\n+----------|| Read the array data back and compare ||----------+\n";
 arrow_float_data:.arrowkdb.ipc.readArrowData[arrow_float;options];
-arrow_float_data_null:.arrowkdb.ipc.readArrowData[arrow_float;options_null];
+arrow_float_data_null:.arrowkdb.ipc.readArrowData[arrow_float_null;options_null];
 float_data~arrow_float_data
-float_data~arrow_float_data_null
+float_data_null~arrow_float_data_null
 rm arrow_float;
 rm arrow_float_null;