red-adbc 0.8.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c015efd686d0e55012a771444c0393f208cb286c675ebf2a7d599cb06581f613
-  data.tar.gz: ffe80b18c200a15fc6068468556d0703a991d45e222978440179f86d66eb723b
+  metadata.gz: ac0000667c7415f8ee8798c14ed39afafe0f261a3c4532a1eaa587c9c0c64a19
+  data.tar.gz: 6ac196ebbd3b0e8ff85c45162643236153c0d92b01e2a3d803abf620cf2bb3e9
 SHA512:
-  metadata.gz: f3a999a7f52871272caa0faff4646360ca80643f2775c6ed62402d89cbf187a3511c24abf8d38ab06713f2c2ce13936e6310785815f7fd29703e729a10259c75
-  data.tar.gz: 86a36800bb560a53ea2d57011f52f954450936ae04f4636e8d2decb3c56eb979756ef2cbecb1e5f17a5a01abc37e51c86d3c67e2119d4d7e2460b0d9bedbe491
+  metadata.gz: fd168666ba54b89fca29a446bc80cd71dab983471dfcef559ad8839adce7a8c58da817ea3c4b2c290a8aa55115724e91f91e4e3d8997aa3f2642984cd4dbff2d
+  data.tar.gz: ad914853fe4fe18a643b3dde325d7c2f1cbc8b1546aa113caca417446145fc132f7eaaaabcf3758a441f1049bdd34df630b8bcb7dacc60ca5ed6466e9359ce5c

data/dependency-check/Rakefile

@@ -34,12 +34,12 @@ end
 namespace :dependency do
   desc "Check dependency"
   task :check do
-    unless PKGConfig.check_version?("adbc-glib",
+    unless PKGConfig.check_version?("adbc-arrow-glib",
                                     ADBC::Version::MAJOR,
                                     ADBC::Version::MINOR,
                                     ADBC::Version::MICRO)
-      unless NativePackageInstaller.install(debian: "libadbc-glib-dev",
-                                            redhat: "adbc-glib-devel")
+      unless NativePackageInstaller.install(debian: "libadbc-arrow-glib-dev",
+                                            redhat: "adbc-arrow-glib-devel")
         exit(false)
       end
     end

data/lib/adbc/arrow-statement.rb

@@ -0,0 +1,65 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+module ADBCArrow
+  class Statement
+    extend ADBC::StatementOpenable
+    include ADBC::StatementOperations
+
+    alias_method :execute_raw, :execute
+    def execute(need_result: true)
+      _, reader, n_rows_affected = execute_raw(need_result)
+      if need_result
+        begin
+          if block_given?
+            yield(reader, n_rows_affected)
+          else
+            [reader.read_all, n_rows_affected]
+          end
+        end
+      else
+        if block_given?
+          yield(n_rows_affected)
+        else
+          n_rows_affected
+        end
+      end
+    end
+
+    alias_method :bind_raw, :bind
+    def bind(*args)
+      n_args = args.size
+      if block_given?
+        message = "wrong number of arguments (given #{n_args}, expected 1 with block)"
+        raise ArgumentError, message unless n_args == 1
+        values = args[0]
+        if values.is_a?(Arrow::Table)
+          values = Arrow::TableBatchReader.new(values)
+        end
+        if values.is_a?(Arrow::RecordBatchReader)
+          bind_stream(values)
+          yield
+        else
+          bind_raw(values)
+          yield
+        end
+      else
+        bind_raw(*args)
+      end
+    end
+  end
+end

data/lib/adbc/loader.rb

@@ -43,3 +43,22 @@ module ADBC
     end
   end
 end
+
+module ADBCArrow
+  class Loader < GObjectIntrospection::Loader
+    class << self
+      def load
+        super("ADBCArrow", ADBCArrow)
+      end
+    end
+
+    private
+    def post_load(repository, namespace)
+      require_libraries
+    end
+
+    def require_libraries
+      require_relative "arrow-statement"
+    end
+  end
+end

data/lib/adbc/statement-openable.rb

@@ -0,0 +1,33 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+module ADBC
+  module StatementOpenable
+    def open(connection)
+      statement = new(connection)
+      if block_given?
+        begin
+          yield(statement)
+        ensure
+          statement.release
+        end
+      else
+        statement
+      end
+    end
+  end
+end

data/lib/adbc/statement-operations.rb

@@ -0,0 +1,33 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+module ADBC
+  module StatementOperations
+    def ingest(table_name, values, mode: :create)
+      self.ingest_target_table = table_name
+      self.ingest_mode = mode
+      bind(values) do
+        execute(need_result: false)
+      end
+    end
+
+    def query(sql, &block)
+      self.sql_query = sql
+      execute(&block)
+    end
+  end
+end

data/lib/adbc/statement.rb

@@ -15,22 +15,13 @@
 # specific language governing permissions and limitations
 # under the License.
 
+require_relative "statement-openable"
+require_relative "statement-operations"
+
 module ADBC
   class Statement
-    class << self
-      def open(connection)
-        statement = new(connection)
-        if block_given?
-          begin
-            yield(statement)
-          ensure
-            statement.release
-          end
-        else
-          statement
-        end
-      end
-    end
+    extend StatementOpenable
+    include StatementOperations
 
     alias_method :execute_raw, :execute
     def execute(need_result: true)
@@ -94,25 +85,5 @@ module ADBC
         bind_raw(*args)
       end
     end
-
-    def ingest(table_name, values, mode: :create)
-      insert = "INSERT INTO #{table_name} (" # TODO escape
-      fields = values.schema.fields
-      insert << fields.collect(&:name).join(", ")
-      insert << ") VALUES ("
-      insert << (["?"] * fields.size).join(", ")
-      insert << ")"
-      self.sql_query = insert
-      self.ingest_target_table = table_name
-      self.ingest_mode = mode
-      bind(values) do
-        execute(need_result: false)
-      end
-    end
-
-    def query(sql, &block)
-      self.sql_query = sql
-      execute(&block)
-    end
   end
 end

data/lib/adbc/version.rb

@@ -16,7 +16,7 @@
 # under the License.
 
 module ADBC
-  VERSION = "0.8.0"
+  VERSION = "0.10.0"
 
   module Version
     MAJOR, MINOR, MICRO, TAG = VERSION.split(".").collect(&:to_i)

data/lib/adbc.rb

@@ -24,6 +24,16 @@ require "adbc/loader"
 module ADBC
   class Error < StandardError
   end
+end
 
-  Loader.load
+ADBC::Loader.load
+begin
+  ADBCArrow::Loader.load
+rescue GObjectIntrospection::RepositoryError
+else
+  module ADBC
+    RawStatement = Statement
+    remove_const(:Statement)
+    Statement = ADBCArrow::Statement
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: red-adbc
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Apache Arrow Developers
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-09 00:00:00.000000000 Z
+date: 2024-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: red-arrow
@@ -38,9 +38,12 @@ files:
 - README.md
 - dependency-check/Rakefile
 - lib/adbc.rb
+- lib/adbc/arrow-statement.rb
 - lib/adbc/connection.rb
 - lib/adbc/database.rb
 - lib/adbc/loader.rb
+- lib/adbc/statement-openable.rb
+- lib/adbc/statement-operations.rb
 - lib/adbc/statement.rb
 - lib/adbc/version.rb
 homepage: https://arrow.apache.org/