activerecord-libsql 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 316c6c859b6a4934167b45e7932bd292cefa21f877056fcfc04f17473718ab09
-  data.tar.gz: cbb445d607e0461fd2d2a1178ccc288636f85a3cd130f0a0fcd37f554a975826
+  metadata.gz: 9a2e0290b309de0e7c29a936ede00a24b7aef1b6c79a648eb2ff5e593b5ee973
+  data.tar.gz: d4b0be5e49b7a3b52bee275016a9dd7145346404691d5918079193b5e44e4cd7
 SHA512:
-  metadata.gz: c9ec7a78ee4f271406d0eccc9c044d0828cfddda975dcdcb01bfcf17952f26608749d7c1b37c3d486d2f461802ba621b79178479b103f00ad4c4ab8f22bdcab4
-  data.tar.gz: 9394fa8177b7a26e2cdee7c12ff72a1fbe7d079c2836c6b86e4580ab88d2536162b8ab0344fdd3e901de8a33aa7cc2b529924d48025c82b562b803815955b121
+  metadata.gz: e7d1a814f4be1669eb69a31df52aa316f66e200ad014c7ced335b71cfddf377e782da639cfa709eac01cccaae9b8ff4366ee153394288476d28447920a977b06
+  data.tar.gz: bde5a707c097e7f35b71ab8a49d720402829b6f869812886d47dbd00912ca7407a7bcb833a4d635f564df8903699f3cce61460760db4dab7d2b69fc7426e9847

data/lib/active_record/connection_adapters/libsql_adapter.rb

@@ -41,6 +41,18 @@ module ActiveRecord
       )
       private_constant :READ_QUERY
 
+      # AR 8.1 で Column.new のシグネチャが変わったため、ロード時に一度だけ決定する
+      # AR <= 8.0: Column.new(name, default, sql_type_metadata, null)
+      # AR >= 8.1: Column.new(name, cast_type, default, sql_type_metadata, null)
+      COLUMN_BUILDER =
+        if ActiveRecord::VERSION::MAJOR > 8 ||
+           (ActiveRecord::VERSION::MAJOR == 8 && ActiveRecord::VERSION::MINOR >= 1)
+          ->(name, cast_type, default, sql_type_md, null) { Column.new(name, cast_type, default, sql_type_md, null) }
+        else
+          ->(name, _cast_type, default, sql_type_md, null) { Column.new(name, default, sql_type_md, null) }
+        end
+      private_constant :COLUMN_BUILDER
+
       # -----------------------------------------------------------------------
       # Adapter 識別
       # -----------------------------------------------------------------------
@@ -142,8 +154,9 @@ module ActiveRecord
           build_result(rows)
         else
           affected = raw_connection.execute(expanded_sql)
-          notification_payload[:row_count] = affected if notification_payload
-          ActiveRecord::Result.empty(affected_rows: affected.to_i)
+          @last_affected_rows = affected.to_i
+          notification_payload[:row_count] = @last_affected_rows if notification_payload
+          ActiveRecord::Result.empty
         end
       rescue RuntimeError => e
         raise translate_exception(e, message: e.message, sql: expanded_sql, binds: [])
@@ -154,8 +167,8 @@ module ActiveRecord
         raw_result
       end
 
-      def affected_rows(raw_result)
-        raw_result.length
+      def affected_rows(_raw_result)
+        @last_affected_rows || 0
       end
 
       # -----------------------------------------------------------------------
@@ -208,14 +221,8 @@ module ActiveRecord
           sql_type    = row['type'].to_s
           cast_type   = type_map.lookup(sql_type) || Type::Value.new
           sql_type_md = fetch_type_metadata(sql_type)
-          # AR 8.1: Column.new(name, cast_type, default, sql_type_metadata, null)
-          Column.new(
-            row['name'],
-            cast_type,
-            row['dflt_value'],
-            sql_type_md,
-            row['notnull'].to_i.zero?
-          )
+          null        = row['notnull'].to_i.zero?
+          COLUMN_BUILDER.call(row['name'], cast_type, row['dflt_value'], sql_type_md, null)
         end
       end
 

data/lib/activerecord/libsql/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveRecord
   module Libsql
-    VERSION = '0.1.0'
+    VERSION = '0.1.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-libsql
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - aileron