activerecord-cockroachdb-adapter 5.2.0.beta2 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce049d6cebd6b2024fe869221ab66233f8b529c00acd33020733c8e6a4d2721f
-  data.tar.gz: 4f2f4442b80029ad6954fc3231350ce0a22a4d984c31d1db8ddc454b1f558d71
+  metadata.gz: 46f54513723481232d2a5370abffb158a9345528df0a5273ddc25ee9023ced0a
+  data.tar.gz: b446b3bbead5b53abaa0d4a04c52b5107ee5b6f72ab05b0e9ebfa622b4f638ce
 SHA512:
-  metadata.gz: d9ce3b5f71d8a342350781ebfad293cd4d152e7cffe432591f09383f32eb52322a2e7c0011ce665ce6c6331b5c1012d61729b7d377b3468bd626a7023b7c04fe
-  data.tar.gz: d9013df894826c090485affc94d66df70d2ac79ac48d85ffe305598c2decaf217ab317d5c86a0a794d096bd309cfaf14c9a671f96d26dece5b37b031913fe4e9
+  metadata.gz: 04102aa919b63c395af75de04ce50988662c4502823d532712c8ba3cf7f2741cb83903de11fd4aceb526499159ced116c92b72f75ec08270a37ed8133fab45a7
+  data.tar.gz: 1c64a1cb23146aa20ddd210d9756c3131fab8a9590ab16eac38ee8e28ee2aa6c5bb1d6fb7df4817ee2f24f1ef74933de274114e73819f3d1f4096904b541895d

data/activerecord-cockroachdb-adapter.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "activerecord-cockroachdb-adapter"
-  spec.version       = "5.2.0.beta2"
+  spec.version       = "5.2.0"
   spec.licenses      = ["Apache-2.0"]
   spec.authors       = ["Cockroach Labs"]
   spec.email         = ["cockroach-db@googlegroups.com"]

data/lib/active_record/connection_adapters/cockroachdb/database_statements.rb

@@ -15,6 +15,87 @@ module ActiveRecord
             serializable:     "SERIALIZABLE"
           }
         end
+
+        # Overridden to avoid using transactions for schema creation.
+        def insert_fixtures_set(fixture_set, tables_to_delete = [])
+          fixture_inserts = build_fixture_statements(fixture_set)
+          table_deletes = tables_to_delete.map { |table| "DELETE FROM #{quote_table_name(table)}" }
+          statements = table_deletes + fixture_inserts
+
+          with_multi_statements do
+            disable_referential_integrity do
+              execute_batch(statements, "Fixtures Load")
+            end
+          end
+        end
+
+        private
+          def execute_batch(statements, name = nil)
+            statements.each do |statement|
+              execute(statement, name)
+            end
+          end
+
+          DEFAULT_INSERT_VALUE = Arel.sql("DEFAULT").freeze
+          private_constant :DEFAULT_INSERT_VALUE
+
+          def default_insert_value(column)
+            DEFAULT_INSERT_VALUE
+          end
+
+          def build_fixture_sql(fixtures, table_name)
+            columns = schema_cache.columns_hash(table_name)
+
+            values_list = fixtures.map do |fixture|
+              fixture = fixture.stringify_keys
+
+              unknown_columns = fixture.keys - columns.keys
+              if unknown_columns.any?
+                raise Fixture::FixtureError, %(table "#{table_name}" has no columns named #{unknown_columns.map(&:inspect).join(', ')}.)
+              end
+
+              columns.map do |name, column|
+                if fixture.key?(name)
+                  type = lookup_cast_type_from_column(column)
+                  with_yaml_fallback(type.serialize(fixture[name]))
+                else
+                  default_insert_value(column)
+                end
+              end
+            end
+
+            table = Arel::Table.new(table_name)
+            manager = Arel::InsertManager.new
+            manager.into(table)
+
+            if values_list.size == 1
+              values = values_list.shift
+              new_values = []
+              columns.each_key.with_index { |column, i|
+                unless values[i].equal?(DEFAULT_INSERT_VALUE)
+                  new_values << values[i]
+                  manager.columns << table[column]
+                end
+              }
+              values_list << new_values
+            else
+              columns.each_key { |column| manager.columns << table[column] }
+            end
+
+            manager.values = manager.create_values_list(values_list)
+            manager.to_sql
+          end
+
+          def build_fixture_statements(fixture_set)
+            fixture_set.map do |table_name, fixtures|
+              next if fixtures.empty?
+              build_fixture_sql(fixtures, table_name)
+            end.compact
+          end
+
+          def with_multi_statements
+            yield
+          end
       end
     end
   end

data/lib/active_record/connection_adapters/cockroachdb/schema_statements.rb

@@ -38,6 +38,29 @@ module ActiveRecord
         def default_sequence_name(table_name, pk = "id")
           nil
         end
+
+        # CockroachDB will use INT8 if the SQL type is INTEGER, so we make it use
+        # INT4 explicitly when needed.
+        def type_to_sql(type, limit: nil, precision: nil, scale: nil, array: nil, **) # :nodoc:
+          sql = \
+            case type.to_s
+            when "integer"
+              case limit
+              when nil; "int"
+              when 1, 2; "int2"
+              when 3, 4; "int4"
+              when 5..8; "int8"
+              else super
+              end
+            else
+              super
+            end
+          # The call to super might have appeneded [] already.
+          if array && type != :primary_key && !sql.end_with?("[]")
+            sql = "#{sql}[]" 
+          end
+          sql
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-cockroachdb-adapter
 version: !ruby/object:Gem::Version
-  version: 5.2.0.beta2
+  version: 5.2.0
 platform: ruby
 authors:
 - Cockroach Labs
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-07 00:00:00.000000000 Z
+date: 2020-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -88,9 +88,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.2
 signing_key: