Skip to content

Commit 9b9a0ac

Browse files
committed
make main compile again
1 parent 664d7e4 commit 9b9a0ac

4 files changed

Lines changed: 6 additions & 7 deletions

File tree

external/duckdb

Submodule duckdb updated 674 files

src/duckdb_py/arrow/pyarrow_filter_pushdown.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,9 @@ py::object MakePyArrowScalar(const Value &constant, const string &timezone_confi
7979
// Cast::Operation<dtime_ns_t, int64_t> for which no specialization exists, and
8080
// throws "Unimplemented type for cast (INT64 -> INT64)". Use the type-strong
8181
// GetValueUnsafe<dtime_ns_t>() which reads `value_.time_ns` from the union
82-
// directly. The `dtime_ns_t.micros` field name is a misnomer — it actually holds
83-
// nanoseconds (see arrow_conversion.cpp:432).
82+
// directly. dtime_ns_t.value holds nanoseconds (see arrow_conversion.cpp:432).
8483
py::handle date_type = import_cache.pyarrow.time64();
85-
return dataset_scalar(scalar(constant.GetValueUnsafe<dtime_ns_t>().micros, date_type("ns")));
84+
return dataset_scalar(scalar(constant.GetValueUnsafe<dtime_ns_t>().value, date_type("ns")));
8685
}
8786
case LogicalTypeId::TIMESTAMP: {
8887
py::handle date_type = import_cache.pyarrow.timestamp();

src/duckdb_py/native/python_objects.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -603,7 +603,7 @@ py::object PythonObject::FromValue(const Value &val, const LogicalType &type,
603603
time = val.GetValueUnsafe<dtime_t>();
604604
} else {
605605
// Python's datetime doesn't support nanoseconds, we convert to micros.
606-
time = val.GetValueUnsafe<dtime_ns_t>().time();
606+
time = dtime_t(val.GetValueUnsafe<dtime_ns_t>().value / 1000);
607607
}
608608
duckdb::Time::Convert(time, hour, min, sec, usec);
609609
try {

src/duckdb_py/pyconnection.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ std::shared_ptr<DuckDBPyConnection> DuckDBPyConnection::UnregisterUDF(const stri
424424
auto &catalog = Catalog::GetCatalog(context, SYSTEM_CATALOG);
425425
DropInfo info;
426426
info.type = CatalogType::SCALAR_FUNCTION_ENTRY;
427-
info.NameMutable() = Identifier(name);
427+
info.SetName(Identifier(name));
428428
info.allow_drop_internal = true;
429429
info.cascade = false;
430430
info.if_not_found = OnEntryNotFound::THROW_EXCEPTION;
@@ -1664,7 +1664,7 @@ std::unique_ptr<DuckDBPyRelation> DuckDBPyConnection::Table(const string &tname)
16641664
auto &connection = con.GetConnection();
16651665
auto qualified_name = QualifiedName::Parse(tname);
16661666
if (qualified_name.Schema().empty()) {
1667-
qualified_name.SchemaMutable() = DEFAULT_SCHEMA;
1667+
qualified_name = QualifiedName(qualified_name.Catalog(), DEFAULT_SCHEMA, qualified_name.Name());
16681668
}
16691669
try {
16701670
return CreateRelation(

0 commit comments

Comments
 (0)