added changes back

apache · Oct 18, 2024 · 2111365 · 2111365
1 parent 56d7491
commit 2111365
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/python/pyarrow/scalar.pxi b/python/pyarrow/scalar.pxi
@@ -1235,6 +1235,20 @@ def scalar(value, type=None, *, from_pandas=None, MemoryPool memory_pool=None):
         ty = ensure_type(type)
         options.type = ty.sp_type
 
+    cdef shared_ptr[CArray] c_array
+    cdef shared_ptr[CScalar] c_scalar
+
+    if hasattr(value, "__arrow_c_array__"):
+        c_array = pyarrow_unwrap_array(value.__arrow_c_array__())
+        if c_array.get().length() != 1:
+            raise ValueError("Expected a length-1 array for scalar construction")
+        with nogil:
+            c_scalar = GetResultValue(c_array.get().GetScalar(0))
+        result = Scalar.wrap(c_scalar)
+        if extension_type is not None:
+            result = ExtensionScalar.from_storage(extension_type, result)
+        return result
+
     if from_pandas is None:
         options.from_pandas = is_pandas_object
     else: