From cfd6c7ceb490d8c2766fd91a4719bdf9f6e4f110 Mon Sep 17 00:00:00 2001 From: David Steele Date: Mon, 18 Apr 2022 12:14:22 -0400 Subject: [PATCH] Use specific integer types in postgres/client and db unit tests. This will work better once we are able to transmit the results with stronger typing. Also remove int2 which was not being used. --- src/postgres/client.c | 1 - test/src/common/harnessPq.h | 18 ++++++++++-------- test/src/module/db/dbTest.c | 4 ++-- test/src/module/postgres/clientTest.c | 2 +- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/postgres/client.c b/src/postgres/client.c index a8f376f01..5daa2bb88 100644 --- a/src/postgres/client.c +++ b/src/postgres/client.c @@ -294,7 +294,6 @@ pgClientQuery(PgClient *this, const String *query) // Integer types case 20: // int8 - case 21: // int2 case 23: // int4 case 26: // oid varLstAdd(resultRow, varNewInt64(cvtZToInt64(value))); diff --git a/test/src/common/harnessPq.h b/test/src/common/harnessPq.h index 2375868c3..844634e5a 100644 --- a/test/src/common/harnessPq.h +++ b/test/src/common/harnessPq.h @@ -77,11 +77,11 @@ Macros for defining groups of functions that implement various queries and comma {.session = sessionParam, .function = HRNPQ_RESULTSTATUS, .resultInt = PGRES_TUPLES_OK}, \ {.session = sessionParam, .function = HRNPQ_NTUPLES, .resultInt = 1}, \ {.session = sessionParam, .function = HRNPQ_NFIELDS, .resultInt = 5}, \ - {.session = sessionParam, .function = HRNPQ_FTYPE, .param = "[0]", .resultInt = HRNPQ_TYPE_INT}, \ + {.session = sessionParam, .function = HRNPQ_FTYPE, .param = "[0]", .resultInt = HRNPQ_TYPE_INT4}, \ {.session = sessionParam, .function = HRNPQ_FTYPE, .param = "[1]", .resultInt = HRNPQ_TYPE_TEXT}, \ {.session = sessionParam, .function = HRNPQ_FTYPE, .param = "[2]", .resultInt = HRNPQ_TYPE_TEXT}, \ {.session = sessionParam, .function = HRNPQ_FTYPE, .param = "[3]", .resultInt = HRNPQ_TYPE_TEXT}, \ - {.session = sessionParam, .function = HRNPQ_FTYPE, .param = "[4]", .resultInt = HRNPQ_TYPE_INT}, \ + {.session = sessionParam, .function = HRNPQ_FTYPE, .param = "[4]", .resultInt = HRNPQ_TYPE_INT4}, \ {.session = sessionParam, .function = HRNPQ_GETVALUE, .param = "[0,0]", .resultZ = STRINGIFY(versionParam)}, \ {.session = sessionParam, .function = HRNPQ_GETVALUE, .param = "[0,1]", .resultZ = pgPathParam}, \ {.session = sessionParam, .function = HRNPQ_GETVALUE, .param = "[0,2]", .resultZ = archiveMode == NULL ? "on" \ @@ -196,7 +196,7 @@ Macros for defining groups of functions that implement various queries and comma {.session = sessionParam, .function = HRNPQ_RESULTSTATUS, .resultInt = PGRES_TUPLES_OK}, \ {.session = sessionParam, .function = HRNPQ_NTUPLES, .resultInt = 1}, \ {.session = sessionParam, .function = HRNPQ_NFIELDS, .resultInt = 1}, \ - {.session = sessionParam, .function = HRNPQ_FTYPE, .param = "[0]", .resultInt = HRNPQ_TYPE_INT}, \ + {.session = sessionParam, .function = HRNPQ_FTYPE, .param = "[0]", .resultInt = HRNPQ_TYPE_INT8}, \ {.session = sessionParam, .function = HRNPQ_GETVALUE, .param = "[0,0]", \ .resultZ = strZ(strNewFmt("%" PRId64, (int64_t)(timeParam)))}, \ {.session = sessionParam, .function = HRNPQ_CLEAR}, \ @@ -386,9 +386,9 @@ Macros for defining groups of functions that implement various queries and comma {.session = sessionParam, .function = HRNPQ_RESULTSTATUS, .resultInt = PGRES_TUPLES_OK}, \ {.session = sessionParam, .function = HRNPQ_NTUPLES, .resultInt = 1}, \ {.session = sessionParam, .function = HRNPQ_NFIELDS, .resultInt = 3}, \ - {.session = sessionParam, .function = HRNPQ_FTYPE, .param = "[0]", .resultInt = HRNPQ_TYPE_INT}, \ + {.session = sessionParam, .function = HRNPQ_FTYPE, .param = "[0]", .resultInt = HRNPQ_TYPE_OID}, \ {.session = sessionParam, .function = HRNPQ_FTYPE, .param = "[1]", .resultInt = HRNPQ_TYPE_TEXT}, \ - {.session = sessionParam, .function = HRNPQ_FTYPE, .param = "[2]", .resultInt = HRNPQ_TYPE_INT}, \ + {.session = sessionParam, .function = HRNPQ_FTYPE, .param = "[2]", .resultInt = HRNPQ_TYPE_OID}, \ {.session = sessionParam, .function = HRNPQ_GETVALUE, .param = "[0,0]", .resultZ = STRINGIFY(16384)}, \ {.session = sessionParam, .function = HRNPQ_GETVALUE, .param = "[0,1]", .resultZ = databaseNameParam}, \ {.session = sessionParam, .function = HRNPQ_GETVALUE, .param = "[0,2]", .resultZ = STRINGIFY(13777)}, \ @@ -405,7 +405,7 @@ Macros for defining groups of functions that implement various queries and comma {.session = sessionParam, .function = HRNPQ_RESULTSTATUS, .resultInt = PGRES_TUPLES_OK}, \ {.session = sessionParam, .function = HRNPQ_NTUPLES, .resultInt = 0}, \ {.session = sessionParam, .function = HRNPQ_NFIELDS, .resultInt = 2}, \ - {.session = sessionParam, .function = HRNPQ_FTYPE, .param = "[0]", .resultInt = HRNPQ_TYPE_INT}, \ + {.session = sessionParam, .function = HRNPQ_FTYPE, .param = "[0]", .resultInt = HRNPQ_TYPE_OID}, \ {.session = sessionParam, .function = HRNPQ_FTYPE, .param = "[1]", .resultInt = HRNPQ_TYPE_TEXT}, \ {.session = sessionParam, .function = HRNPQ_CLEAR}, \ {.session = sessionParam, .function = HRNPQ_GETRESULT, .resultNull = true} @@ -420,7 +420,7 @@ Macros for defining groups of functions that implement various queries and comma {.session = sessionParam, .function = HRNPQ_RESULTSTATUS, .resultInt = PGRES_TUPLES_OK}, \ {.session = sessionParam, .function = HRNPQ_NTUPLES, .resultInt = 1}, \ {.session = sessionParam, .function = HRNPQ_NFIELDS, .resultInt = 2}, \ - {.session = sessionParam, .function = HRNPQ_FTYPE, .param = "[0]", .resultInt = HRNPQ_TYPE_INT}, \ + {.session = sessionParam, .function = HRNPQ_FTYPE, .param = "[0]", .resultInt = HRNPQ_TYPE_OID}, \ {.session = sessionParam, .function = HRNPQ_FTYPE, .param = "[1]", .resultInt = HRNPQ_TYPE_TEXT}, \ {.session = sessionParam, .function = HRNPQ_GETVALUE, .param = "[0,0]", .resultZ = strZ(strNewFmt("%d", id1Param))}, \ {.session = sessionParam, .function = HRNPQ_GETVALUE, .param = "[0,1]", .resultZ = name1Param}, \ @@ -545,7 +545,9 @@ Macros to simplify dbOpen() for specific database versions Data type constants ***********************************************************************************************************************************/ #define HRNPQ_TYPE_BOOL 16 -#define HRNPQ_TYPE_INT 20 +#define HRNPQ_TYPE_INT4 23 +#define HRNPQ_TYPE_INT8 20 +#define HRNPQ_TYPE_OID 26 #define HRNPQ_TYPE_TEXT 25 /*********************************************************************************************************************************** diff --git a/test/src/module/db/dbTest.c b/test/src/module/db/dbTest.c index d96ab3278..615d19a36 100644 --- a/test/src/module/db/dbTest.c +++ b/test/src/module/db/dbTest.c @@ -230,11 +230,11 @@ testRun(void) {.session = 1, .function = HRNPQ_RESULTSTATUS, .resultInt = PGRES_TUPLES_OK}, {.session = 1, .function = HRNPQ_NTUPLES, .resultInt = 1}, {.session = 1, .function = HRNPQ_NFIELDS, .resultInt = 5}, - {.session = 1, .function = HRNPQ_FTYPE, .param = "[0]", .resultInt = HRNPQ_TYPE_INT}, + {.session = 1, .function = HRNPQ_FTYPE, .param = "[0]", .resultInt = HRNPQ_TYPE_INT4}, {.session = 1, .function = HRNPQ_FTYPE, .param = "[1]", .resultInt = HRNPQ_TYPE_TEXT}, {.session = 1, .function = HRNPQ_FTYPE, .param = "[2]", .resultInt = HRNPQ_TYPE_TEXT}, {.session = 1, .function = HRNPQ_FTYPE, .param = "[3]", .resultInt = HRNPQ_TYPE_TEXT}, - {.session = 1, .function = HRNPQ_FTYPE, .param = "[4]", .resultInt = HRNPQ_TYPE_INT}, + {.session = 1, .function = HRNPQ_FTYPE, .param = "[4]", .resultInt = HRNPQ_TYPE_INT4}, {.session = 1, .function = HRNPQ_GETVALUE, .param = "[0,0]", .resultZ = "0"}, {.session = 1, .function = HRNPQ_GETVALUE, .param = "[0,1]", .resultZ = "value"}, {.session = 1, .function = HRNPQ_GETVALUE, .param = "[0,2]", .resultZ = "value"}, diff --git a/test/src/module/postgres/clientTest.c b/test/src/module/postgres/clientTest.c index 05899ab17..9dd222bc7 100644 --- a/test/src/module/postgres/clientTest.c +++ b/test/src/module/postgres/clientTest.c @@ -301,7 +301,7 @@ testRun(void) {.function = HRNPQ_NTUPLES, .resultInt = 2}, {.function = HRNPQ_NFIELDS, .resultInt = 4}, - {.function = HRNPQ_FTYPE, .param = "[0]", .resultInt = HRNPQ_TYPE_INT}, + {.function = HRNPQ_FTYPE, .param = "[0]", .resultInt = HRNPQ_TYPE_OID}, {.function = HRNPQ_FTYPE, .param = "[1]", .resultInt = HRNPQ_TYPE_TEXT}, {.function = HRNPQ_FTYPE, .param = "[2]", .resultInt = HRNPQ_TYPE_TEXT}, {.function = HRNPQ_FTYPE, .param = "[3]", .resultInt = HRNPQ_TYPE_BOOL},