diff --git a/c/driver/postgresql/postgresql_test.cc b/c/driver/postgresql/postgresql_test.cc index 33115bcf8b..a826e17267 100644 --- a/c/driver/postgresql/postgresql_test.cc +++ b/c/driver/postgresql/postgresql_test.cc @@ -576,9 +576,9 @@ class PostgresStatementTest : public ::testing::Test, } protected: - void ValidateIngestedTemporalData(struct ArrowArrayView* values, - enum ArrowTimeUnit unit, - const char* timezone) override { + void ValidateIngestedTimestampData(struct ArrowArrayView* values, + enum ArrowTimeUnit unit, + const char* timezone) override { std::vector> expected; switch (unit) { case (NANOARROW_TIME_UNIT_SECOND): diff --git a/c/driver/sqlite/sqlite_test.cc b/c/driver/sqlite/sqlite_test.cc index 3c5f9caf68..b03158cca6 100644 --- a/c/driver/sqlite/sqlite_test.cc +++ b/c/driver/sqlite/sqlite_test.cc @@ -201,9 +201,9 @@ class SqliteStatementTest : public ::testing::Test, } protected: - void ValidateIngestedTemporalData(struct ArrowArrayView* values, - enum ArrowTimeUnit unit, - const char* timezone) override { + void ValidateIngestedTimestampData(struct ArrowArrayView* values, + enum ArrowTimeUnit unit, + const char* timezone) override { std::vector> expected; switch (unit) { case (NANOARROW_TIME_UNIT_SECOND): diff --git a/c/validation/adbc_validation.cc b/c/validation/adbc_validation.cc index 609e05defd..e84cc518f5 100644 --- a/c/validation/adbc_validation.cc +++ b/c/validation/adbc_validation.cc @@ -1105,7 +1105,7 @@ void StatementTest::TestSqlIngestDate32() { } template -void StatementTest::TestSqlIngestTemporalType(const char* timezone) { +void StatementTest::TestSqlIngestTimestampType(const char* timezone) { if (!quirks()->supports_bulk_ingest()) { GTEST_SKIP(); } @@ -1164,7 +1164,7 @@ void StatementTest::TestSqlIngestTemporalType(const char* timezone) { ASSERT_EQ(values.size(), reader.array->length); ASSERT_EQ(1, reader.array->n_children); - ValidateIngestedTemporalData(reader.array_view->children[0], TU, timezone); + ValidateIngestedTimestampData(reader.array_view->children[0], TU, timezone); ASSERT_NO_FATAL_FAILURE(reader.Next()); ASSERT_EQ(nullptr, reader.array->release); @@ -1173,33 +1173,34 @@ void StatementTest::TestSqlIngestTemporalType(const char* timezone) { ASSERT_THAT(AdbcStatementRelease(&statement, &error), IsOkStatus(&error)); } -void StatementTest::ValidateIngestedTemporalData(struct ArrowArrayView* values, - enum ArrowTimeUnit unit, - const char* timezone) { - FAIL() << "ValidateIngestedTemporalData is not implemented in the base class"; +void StatementTest::ValidateIngestedTimestampData(struct ArrowArrayView* values, + enum ArrowTimeUnit unit, + const char* timezone) { + FAIL() << "ValidateIngestedTimestampData is not implemented in the base class"; } void StatementTest::TestSqlIngestTimestamp() { - ASSERT_NO_FATAL_FAILURE(TestSqlIngestTemporalType(nullptr)); - ASSERT_NO_FATAL_FAILURE(TestSqlIngestTemporalType(nullptr)); - ASSERT_NO_FATAL_FAILURE(TestSqlIngestTemporalType(nullptr)); - ASSERT_NO_FATAL_FAILURE(TestSqlIngestTemporalType(nullptr)); + ASSERT_NO_FATAL_FAILURE( + TestSqlIngestTimestampType(nullptr)); + ASSERT_NO_FATAL_FAILURE(TestSqlIngestTimestampType(nullptr)); + ASSERT_NO_FATAL_FAILURE(TestSqlIngestTimestampType(nullptr)); + ASSERT_NO_FATAL_FAILURE(TestSqlIngestTimestampType(nullptr)); } void StatementTest::TestSqlIngestTimestampTz() { - ASSERT_NO_FATAL_FAILURE(TestSqlIngestTemporalType("UTC")); - ASSERT_NO_FATAL_FAILURE(TestSqlIngestTemporalType("UTC")); - ASSERT_NO_FATAL_FAILURE(TestSqlIngestTemporalType("UTC")); - ASSERT_NO_FATAL_FAILURE(TestSqlIngestTemporalType("UTC")); + ASSERT_NO_FATAL_FAILURE(TestSqlIngestTimestampType("UTC")); + ASSERT_NO_FATAL_FAILURE(TestSqlIngestTimestampType("UTC")); + ASSERT_NO_FATAL_FAILURE(TestSqlIngestTimestampType("UTC")); + ASSERT_NO_FATAL_FAILURE(TestSqlIngestTimestampType("UTC")); ASSERT_NO_FATAL_FAILURE( - TestSqlIngestTemporalType("America/Los_Angeles")); + TestSqlIngestTimestampType("America/Los_Angeles")); ASSERT_NO_FATAL_FAILURE( - TestSqlIngestTemporalType("America/Los_Angeles")); + TestSqlIngestTimestampType("America/Los_Angeles")); ASSERT_NO_FATAL_FAILURE( - TestSqlIngestTemporalType("America/Los_Angeles")); + TestSqlIngestTimestampType("America/Los_Angeles")); ASSERT_NO_FATAL_FAILURE( - TestSqlIngestTemporalType("America/Los_Angeles")); + TestSqlIngestTimestampType("America/Los_Angeles")); } void StatementTest::TestSqlIngestInterval() { diff --git a/c/validation/adbc_validation.h b/c/validation/adbc_validation.h index bbe371195e..23dacb7f4b 100644 --- a/c/validation/adbc_validation.h +++ b/c/validation/adbc_validation.h @@ -278,11 +278,11 @@ class StatementTest { void TestSqlIngestNumericType(ArrowType type); template - void TestSqlIngestTemporalType(const char* timezone); + void TestSqlIngestTimestampType(const char* timezone); - virtual void ValidateIngestedTemporalData(struct ArrowArrayView* values, - enum ArrowTimeUnit unit, - const char* timezone); + virtual void ValidateIngestedTimestampData(struct ArrowArrayView* values, + enum ArrowTimeUnit unit, + const char* timezone); }; #define ADBCV_TEST_STATEMENT(FIXTURE) \