clickhouse-native 0.1.3 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99a3891e30d35144bd50c299fe5ee814e4a491860c7a7d066043982563960c39
-  data.tar.gz: 3c0dbaff2bc6db96ff5e1a8c5dbab67d6b4233571834e127f5a115570ef70346
+  metadata.gz: ec4d2e97965b571da7367ccc55b66dbdcd12ab021205dd557b9cc5caca351ade
+  data.tar.gz: 2cea94982674d7b200b7decca83f2436cde647c2305b4b64aba201b50a9365c0
 SHA512:
-  metadata.gz: b16891dc09f48773e9bdb59fffa07a645c4ab90dbc6723f58c48369eb18d81995f7df584b097048b751eb7737717015aacc838fd3884bb7f17aca94220ed7d20
-  data.tar.gz: 94db3b9126927989d8a875a21a8ca096c9bb5f37eb859546295a15c891f1832f50f31e7a35971f94e57a9b5e876d0040a626fc130113269a3658110fa10eb3e5
+  metadata.gz: 8d35945de6ccb097385ddb5e21584d8b3f99df1db01bd4f631e52c27b0b7d1faafbcc85d511e07269606c441a10cf6ded46c14089af2cf519d78a53f5739d611
+  data.tar.gz: add830a89e72da435b26521dbc61a8e7fec42403932af2b53fe2eefa896b672e8431083d0c0e4a1db8258d5dc31dc2932c799bb495f40857aaa13c7ec2a5a9be

data/ext/clickhouse_native/client.cpp

@@ -174,16 +174,24 @@ static VALUE value_at(const ColumnRef& col, size_t idx) {
         }
 
         case Type::Date: {
-            auto t = col->As<ColumnDate>()->At(idx);
-            return rb_time_new(t, 0);
+            // Return a Ruby Date so as_json/to_s gives "YYYY-MM-DD" instead of
+            // a full ISO8601 timestamp. CH Date is days since 1970-01-01 UTC.
+            std::time_t t = col->As<ColumnDate>()->At(idx);
+            long days = static_cast<long>(t / 86400);
+            VALUE rb_cDate = rb_const_get(rb_cObject, rb_intern("Date"));
+            return rb_funcall(rb_cDate, rb_intern("jd"), 1, LONG2NUM(days + 2440588));
         }
         case Type::Date32: {
-            auto t = col->As<ColumnDate32>()->At(idx);
-            return rb_time_new(t, 0);
+            std::time_t t = col->As<ColumnDate32>()->At(idx);
+            long days = static_cast<long>(t / 86400);
+            VALUE rb_cDate = rb_const_get(rb_cObject, rb_intern("Date"));
+            return rb_funcall(rb_cDate, rb_intern("jd"), 1, LONG2NUM(days + 2440588));
         }
         case Type::DateTime: {
             auto t = col->As<ColumnDateTime>()->At(idx);
-            return rb_time_new(t, 0);
+            VALUE rb_t = rb_time_new(t, 0);
+            rb_funcall(rb_t, rb_intern("utc"), 0);
+            return rb_t;
         }
         case Type::DateTime64: {
             auto ct = col->As<ColumnDateTime64>();
@@ -194,7 +202,9 @@ static VALUE value_at(const ColumnRef& col, size_t idx) {
             int64_t frac = ticks % denom;
             int64_t usec = (prec <= 6) ? frac * pow10_i64(6 - prec)
                                        : frac / pow10_i64(prec - 6);
-            return rb_time_new(secs, usec);
+            VALUE rb_t = rb_time_new(secs, usec);
+            rb_funcall(rb_t, rb_intern("utc"), 0);
+            return rb_t;
         }
 
         case Type::Array: {
@@ -340,6 +350,28 @@ static bool has_trailing_tz(const char* s, size_t len) {
     return false;
 }
 
+// For Date columns: normalise the value to its UTC-midnight epoch so the
+// calendar day is preserved regardless of the process's local timezone.
+// Handles Date, DateTime, Time, String ("YYYY-MM-DD" etc.), Integer epoch.
+static int64_t coerce_to_date_epoch(VALUE value) {
+    if (RB_INTEGER_TYPE_P(value)) return NUM2LL(value);
+    VALUE date_src = value;
+    if (RB_TYPE_P(value, T_STRING)) {
+        VALUE rb_cDate = rb_const_get(rb_cObject, rb_intern("Date"));
+        date_src = rb_funcall(rb_cDate, rb_intern("parse"), 1, value);
+    } else if (rb_respond_to(value, rb_intern("hour"))) {
+        // Time / DateTime: take the wall-clock date portion as UTC midnight.
+        // We intentionally ignore the TZ offset here — callers who need
+        // strict moment semantics should use DateTime64 instead.
+        date_src = value;
+    }
+    VALUE y = rb_funcall(date_src, rb_intern("year"), 0);
+    VALUE m = rb_funcall(date_src, rb_intern("month"), 0);
+    VALUE d = rb_funcall(date_src, rb_intern("day"), 0);
+    VALUE utc = rb_funcall(rb_cTime, rb_intern("utc"), 3, y, m, d);
+    return NUM2LL(rb_funcall(utc, rb_intern("to_i"), 0));
+}
+
 // Accepts a Time, a String (parsed via Time.parse), or a numeric (epoch
 // seconds). Mirrors how the HTTP gem's JSONEachRow coerced date cells.
 //
@@ -429,16 +461,8 @@ static void append_value(const ColumnRef& col, VALUE value) {
             return;
         }
 
-        case Type::Date: {
-            VALUE t = coerce_to_time(value);
-            col->As<ColumnDate>()->Append(static_cast<std::time_t>(NUM2LL(rb_funcall(t, rb_intern("to_i"), 0))));
-            return;
-        }
-        case Type::Date32: {
-            VALUE t = coerce_to_time(value);
-            col->As<ColumnDate32>()->Append(static_cast<std::time_t>(NUM2LL(rb_funcall(t, rb_intern("to_i"), 0))));
-            return;
-        }
+        case Type::Date:   col->As<ColumnDate>()->Append(static_cast<std::time_t>(coerce_to_date_epoch(value))); return;
+        case Type::Date32: col->As<ColumnDate32>()->Append(static_cast<std::time_t>(coerce_to_date_epoch(value))); return;
         case Type::DateTime: {
             VALUE t = coerce_to_time(value);
             col->As<ColumnDateTime>()->Append(static_cast<std::time_t>(NUM2LL(rb_funcall(t, rb_intern("to_i"), 0))));

data/lib/clickhouse_native/pool.rb

@@ -4,8 +4,13 @@ require "connection_pool"
 
 module ClickhouseNative
   class Pool
+    attr_reader :host, :port, :database
+
     def initialize(host:, port:, database: "default", user: "default", password: "",
                    compression: :none, logger: nil, pool_size: 5, pool_timeout: 5)
+      @host = host
+      @port = port
+      @database = database
       client_kwargs = { host:, port:, database:, user:, password:, compression:, logger: }
       @pool = ConnectionPool.new(size: pool_size, timeout: pool_timeout) do
         Client.new(**client_kwargs)

data/lib/clickhouse_native/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ClickhouseNative
-  VERSION = "0.1.3"
+  VERSION = "0.2.1"
 end

data/lib/clickhouse_native.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "time"
+require "date"
 require "bigdecimal"
 require "clickhouse_native/version"
 require "clickhouse_native/errors"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clickhouse-native
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.1
 platform: ruby
 authors:
 - Yuri Smirnov