refactor: match csv_options field names

Author: steve-chavez

src/aggs.c

@@ -24,32 +24,32 @@ static inline bool needs_quote(const char *s, size_t n, char delim) {
 
 void parse_csv_options(HeapTupleHeader opts_hdr, CsvOptions *csv_opts) {
   // defaults
-  csv_opts->delim    = ',';
-  csv_opts->with_bom = false;
-  csv_opts->header   = true;
+  csv_opts->delimiter = ',';
+  csv_opts->bom       = false;
+  csv_opts->header    = true;
 
   if (opts_hdr == NULL) return;
 
   TupleDesc desc = lookup_rowtype_tupdesc(HeapTupleHeaderGetTypeId(opts_hdr),
                                           HeapTupleHeaderGetTypMod(opts_hdr));
 
-  Datum values[3];
-  bool  nulls[3];
+  Datum values[csv_options_count];
+  bool  nulls[csv_options_count];
 
   heap_deform_tuple(
       &(HeapTupleData){.t_len = HeapTupleHeaderGetDatumLength(opts_hdr), .t_data = opts_hdr}, desc,
       values, nulls);
 
   if (!nulls[0]) {
-    csv_opts->delim = DatumGetChar(values[0]);
-    if (is_reserved(csv_opts->delim))
+    csv_opts->delimiter = DatumGetChar(values[0]);
+    if (is_reserved(csv_opts->delimiter))
       ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
                       errmsg("delimiter cannot be newline, carriage return or "
                              "double quote")));
   }
 
   if (!nulls[1]) {
-    csv_opts->with_bom = DatumGetBool(values[1]);
+    csv_opts->bom = DatumGetBool(values[1]);
   }
 
   if (!nulls[2]) {

src/aggs.h

@@ -1,11 +1,13 @@
 #ifndef AGGS_H
 #define AGGS_H
 
+// mirrors the SQL csv_options type
 typedef struct {
-  char delim;
-  bool with_bom;
+  char delimiter;
+  bool bom;
   bool header;
 } CsvOptions;
+#define csv_options_count 3
 
 typedef struct {
   StringInfoData accum_buf;

src/pg_csv.c

@@ -59,7 +59,7 @@ Datum csv_agg_transfn(PG_FUNCTION_ARGS) {
     TupleDesc tdesc =
         lookup_rowtype_tupdesc(HeapTupleHeaderGetTypeId(next), HeapTupleHeaderGetTypMod(next));
 
-    if (state->options->with_bom) appendBinaryStringInfo(&state->accum_buf, BOM, sizeof(BOM));
+    if (state->options->bom) appendBinaryStringInfo(&state->accum_buf, BOM, sizeof(BOM));
 
     // build header row
     if (state->options->header) {
@@ -69,10 +69,10 @@ Datum csv_agg_transfn(PG_FUNCTION_ARGS) {
           continue;
 
         if (i > 0) // only append delimiter after the first value
-          appendStringInfoChar(&state->accum_buf, state->options->delim);
+          appendStringInfoChar(&state->accum_buf, state->options->delimiter);
 
         char *cstr = NameStr(att->attname);
-        csv_append_field(&state->accum_buf, cstr, strlen(cstr), state->options->delim);
+        csv_append_field(&state->accum_buf, cstr, strlen(cstr), state->options->delimiter);
       }
 
       appendStringInfoChar(&state->accum_buf, NEWLINE);
@@ -107,12 +107,12 @@ Datum csv_agg_transfn(PG_FUNCTION_ARGS) {
     if (att->attisdropped) // pg always keeps dropped columns, guard against this
       continue;
 
-    if (i > 0) appendStringInfoChar(&state->accum_buf, state->options->delim);
+    if (i > 0) appendStringInfoChar(&state->accum_buf, state->options->delimiter);
 
     if (nulls[i]) continue; // empty field for NULL
 
     char *cstr = datum_to_cstring(datums[i], att->atttypid);
-    csv_append_field(&state->accum_buf, cstr, strlen(cstr), state->options->delim);
+    csv_append_field(&state->accum_buf, cstr, strlen(cstr), state->options->delimiter);
   }
 
   PG_RETURN_POINTER(state);