Merge pull request #117 from Mytherin/timestamps

Add support for reading unix epochs as timestamps
duckdb · Sep 25, 2024 · d5d6265 · d5d6265
2 parents 3158619 + 8c5248d
commit d5d6265
Show file tree

Hide file tree

Showing 5 changed files with 74 additions and 9 deletions.
diff --git a/.github/workflows/MainDistributionPipeline.yml b/.github/workflows/MainDistributionPipeline.yml
@@ -14,15 +14,15 @@ concurrency:
 jobs:
   duckdb-stable-build:
     name: Build extension binaries
-    uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@main
+    uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@v1.1.0
     with:
       duckdb_version: main
       extension_name: sqlite_scanner
 
   duckdb-stable-deploy:
     name: Deploy extension binaries
     needs: duckdb-stable-build
-    uses: duckdb/extension-ci-tools/.github/workflows/_extension_deploy.yml@main
+    uses: duckdb/extension-ci-tools/.github/workflows/_extension_deploy.yml@v1.1.0
     secrets: inherit
     with:
       duckdb_version: main

diff --git a/data/db/unix_timestamp.db b/data/db/unix_timestamp.db
diff --git a/src/sqlite_scanner.cpp b/src/sqlite_scanner.cpp
@@ -12,7 +12,7 @@
 #include "duckdb/main/client_context.hpp"
 #include "duckdb/main/config.hpp"
 #include "duckdb/storage/storage_extension.hpp"
-
+#include "duckdb/common/operator/cast_operators.hpp"
 #include <cmath>
 
 namespace duckdb {
@@ -204,6 +204,15 @@ static unique_ptr<GlobalTableFunctionState> SqliteInitGlobalState(ClientContext
 	return std::move(result);
 }
 
+static timestamp_t ConvertTimestampInteger(sqlite3_value *val) {
+	return Timestamp::FromEpochSeconds(sqlite3_value_int64(val));
+}
+
+static timestamp_t ConvertTimestampFloat(sqlite3_value *val) {
+	int64_t timestamp_micros = Cast::Operation<double, int64_t>(sqlite3_value_double(val) * 1000000.0);
+	return Timestamp::FromEpochMicroSeconds(timestamp_micros);
+}
+
 static void SqliteScan(ClientContext &context, TableFunctionInput &data, DataChunk &output) {
 	auto &state = data.local_state->Cast<SqliteLocalState>();
 	auto &gstate = data.global_state->Cast<SqliteGlobalState>();
@@ -255,14 +264,43 @@ static void SqliteScan(ClientContext &context, TableFunctionInput &data, DataChu
 					    out_vec, (const char *)sqlite3_value_text(val), sqlite3_value_bytes(val));
 					break;
 				case LogicalTypeId::DATE:
-					stmt.CheckTypeMatches(bind_data, val, sqlite_column_type, SQLITE_TEXT, col_idx);
-					FlatVector::GetData<date_t>(out_vec)[out_idx] =
-					    Date::FromCString((const char *)sqlite3_value_text(val), sqlite3_value_bytes(val));
+					if (sqlite_column_type == SQLITE_INTEGER) {
+						// unix timestamp
+						FlatVector::GetData<date_t>(out_vec)[out_idx] =
+						    Timestamp::GetDate(ConvertTimestampInteger(val));
+					} else if (sqlite_column_type == SQLITE_FLOAT) {
+						FlatVector::GetData<date_t>(out_vec)[out_idx] = Timestamp::GetDate(ConvertTimestampFloat(val));
+					} else if (sqlite_column_type == SQLITE_TEXT) {
+						FlatVector::GetData<date_t>(out_vec)[out_idx] =
+						    Date::FromCString((const char *)sqlite3_value_text(val), sqlite3_value_bytes(val));
+					} else {
+						throw NotImplementedException(
+						    "Unimplemented SQLite type for column of type DATE\n* SET sqlite_all_varchar=true to "
+						    "load all columns as VARCHAR and skip type conversions");
+					}
 					break;
 				case LogicalTypeId::TIMESTAMP:
-					stmt.CheckTypeMatches(bind_data, val, sqlite_column_type, SQLITE_TEXT, col_idx);
-					FlatVector::GetData<timestamp_t>(out_vec)[out_idx] =
-					    Timestamp::FromCString((const char *)sqlite3_value_text(val), sqlite3_value_bytes(val));
+					// SQLite does not have a timestamp type - but it has "conventions"
+					// See https://www.sqlite.org/lang_datefunc.html
+					// The conventions are:
+					// A text string that is an ISO 8601 date/time value
+					// The number of days including fractional days since -4713-11-24 12:00:00
+					// The number of seconds including fractional seconds since 1970-01-01 00:00:00
+					// for now we only support ISO-8601 and unix timestamps
+					if (sqlite_column_type == SQLITE_INTEGER) {
+						// unix timestamp
+						FlatVector::GetData<timestamp_t>(out_vec)[out_idx] = ConvertTimestampInteger(val);
+					} else if (sqlite_column_type == SQLITE_FLOAT) {
+						FlatVector::GetData<timestamp_t>(out_vec)[out_idx] = ConvertTimestampFloat(val);
+					} else if (sqlite_column_type == SQLITE_TEXT) {
+						// ISO-8601
+						FlatVector::GetData<timestamp_t>(out_vec)[out_idx] =
+						    Timestamp::FromCString((const char *)sqlite3_value_text(val), sqlite3_value_bytes(val));
+					} else {
+						throw NotImplementedException(
+						    "Unimplemented SQLite type for column of type TIMESTAMP\n* SET sqlite_all_varchar=true to "
+						    "load all columns as VARCHAR and skip type conversions");
+					}
 					break;
 				case LogicalTypeId::BLOB:
 					FlatVector::GetData<string_t>(out_vec)[out_idx] = StringVector::AddStringOrBlob(

diff --git a/src/sqlite_stmt.cpp b/src/sqlite_stmt.cpp
@@ -69,6 +69,7 @@ void SQLiteStatement::CheckTypeMatches(const SqliteBindData &bind_data, sqlite3_
 		auto message = "Invalid type in column \"" + column_name + "\": column was declared as " +
 		               SQLiteUtils::TypeToString(expected_type) + ", found \"" + value_as_text + "\" of type \"" +
 		               SQLiteUtils::TypeToString(sqlite_column_type) + "\" instead.";
+		message += "\n* SET sqlite_all_varchar=true to load all columns as VARCHAR and skip type conversions";
 		throw Exception(ExceptionType::MISMATCH_TYPE, message);
 	}
 }
@@ -79,6 +80,7 @@ void SQLiteStatement::CheckTypeIsFloatOrInteger(sqlite3_value *val, int sqlite_c
 		auto value_as_text = string((const char *)sqlite3_value_text(val));
 		auto message = "Invalid type in column \"" + column_name + "\": expected float or integer, found \"" +
 		               value_as_text + "\" of type \"" + SQLiteUtils::TypeToString(sqlite_column_type) + "\" instead.";
+		message += "\n* SET sqlite_all_varchar=true to load all columns as VARCHAR and skip type conversions";
 		throw Exception(ExceptionType::MISMATCH_TYPE, message);
 	}
 }

diff --git a/test/sql/storage/attach_unix_timestamp.test b/test/sql/storage/attach_unix_timestamp.test
@@ -0,0 +1,25 @@
+# name: test/sql/storage/attach_unix_timestamp.test
+# description:
+# group: [sqlite_storage]
+
+require sqlite_scanner
+
+statement ok
+ATTACH 'data/db/unix_timestamp.db' AS s (TYPE SQLITE, READONLY)
+
+query I
+SELECT * FROM s.timestamp
+----
+2024-09-23 08:06:20
+2024-09-23 08:06:22
+
+query I
+SELECT * FROM s.timestamp_fractional
+----
+2024-09-23 08:06:20.5
+2024-09-23 08:06:22.123456
+
+statement error
+SELECT * FROM s.timestamp_out_of_range
+----
+out of range