declare_schema 1.3.5.colin.1 → 1.3.6.colin.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b87dca056e85242e1d681247cce6acdfcc9ff4896f5e74e8f170aad94ad92172
-  data.tar.gz: 9169a1be8735996bb9a1c9a22ed8af926dbe99a405c4fee9f679263823603423
+  metadata.gz: 4d91f7885d45e678a5bb4a5c97cfae29fd6333df27b516981de61f5056050b29
+  data.tar.gz: b4662bc25edc345d3321a2ef364b18b0c13d9e774a5155dfde7d378a61c12a24
 SHA512:
-  metadata.gz: ca2d456cffd1cfb8a6413dfe228078568d476804818d0103a5ebda165f99ea5c7851d0def54026c8f2a0268726a34c2e783d50079ab05782b7e55b25092623d6
-  data.tar.gz: e0ba451918f3814de9c7534cbd0a6e0db8a82621ae03614957b7cf6278c79a6d272e6f241a1324c85fb175d1ceb56b93f04a756280827ee0facaccbecb3d32b5
+  metadata.gz: b332e00969056fcf3e94da639e4c7b5aa4c0e4dceca8edce19a69577c98644c0330ca218825b66af032dba0040ba470800169c651749b04ac5d7de769ef593f5
+  data.tar.gz: b218aadc7d9bbc961281c2854c2ea0debeef971c59af2370a4244c1df5db5a36d542d18cf4b063529af5345a32e1b02cd14e51e37e6b44cc5cf3920b825df335

data/CHANGELOG.md

@@ -4,6 +4,10 @@ Inspired by [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 Note: this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.3.6] - 2024-01-22
+### Fixed
+- Add missing commits around connection: and Array check for composite declared primary key.
+
 ## [1.3.5] - 2024-01-22
 ### Fixed
 - Make `default_charset=` and `default_collation=` lazy so they don't use the database connection to check the

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    declare_schema (1.3.5.colin.1)
+    declare_schema (1.3.6.colin.1)
       rails (>= 5.0)
 
 GEM

data/lib/declare_schema/model/habtm_model_shim.rb

@@ -4,15 +4,17 @@ module DeclareSchema
   module Model
     class HabtmModelShim
       class << self
-        def from_reflection(refl)
-          new(refl.join_table, [refl.foreign_key, refl.association_foreign_key],
-                               [refl.active_record.table_name, refl.class_name.constantize.table_name])
+        def from_reflection(reflection)
+          new(reflection.join_table,
+              [reflection.foreign_key, reflection.association_foreign_key],
+              [reflection.active_record.table_name, reflection.klass.table_name],
+              connection: reflection.active_record.connection)
         end
       end
 
-      attr_reader :join_table, :foreign_keys, :parent_table_names
+      attr_reader :join_table, :foreign_keys, :parent_table_names, :connection
 
-      def initialize(join_table, foreign_keys, parent_table_names)
+      def initialize(join_table, foreign_keys, parent_table_names, connection:)
         foreign_keys.is_a?(Array) && foreign_keys.size == 2 or
           raise ArgumentError, "foreign_keys must be <Array[2]>; got #{foreign_keys.inspect}"
         parent_table_names.is_a?(Array) && parent_table_names.size == 2 or
@@ -20,6 +22,7 @@ module DeclareSchema
         @join_table = join_table
         @foreign_keys = foreign_keys.sort # Rails requires these be in alphabetical order
         @parent_table_names = @foreign_keys == foreign_keys ? parent_table_names : parent_table_names.reverse # match the above sort
+        @connection = connection
       end
 
       def _table_options

data/lib/declare_schema/schema_change/column_add.rb

@@ -6,8 +6,10 @@ module DeclareSchema
   module SchemaChange
     class ColumnAdd < Base
       def initialize(table_name, column_name, column_type, **column_options)
-        @table_name = table_name or raise ArgumentError, "must provide table_name"
-        @column_name = column_name or raise ArgumentError, "must provide column_name"
+        table_name.is_a?(String) || table_name.is_a?(Symbol) or raise ArgumentError, "must provide String|Symbol table_name; got #{table_name.inspect}"
+        column_name.is_a?(String) || column_name.is_a?(Symbol) or raise ArgumentError, "must provide String|Symbol column_name; got #{column_name.inspect}"
+        @table_name = table_name
+        @column_name = column_name
         @column_type = column_type or raise ArgumentError, "must provide column_type"
         @column_options = column_options
       end

data/lib/declare_schema/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DeclareSchema
-  VERSION = "1.3.5.colin.1"
+  VERSION = "1.3.6.colin.1"
 end

data/lib/declare_schema.rb

@@ -86,7 +86,7 @@ module DeclareSchema
     end
 
     def default_charset
-      @default_charset || normalize_charset(@default_charset_before_normalization)
+      @default_charset ||= normalize_charset(@default_charset_before_normalization)
     end
 
     def default_collation=(collation)
@@ -96,7 +96,7 @@ module DeclareSchema
     end
 
     def default_collation
-      @default_collation || normalize_collation(@default_collation_before_normalization)
+      @default_collation ||= normalize_collation(@default_collation_before_normalization)
     end
 
     def default_text_limit=(text_limit)

data/lib/generators/declare_schema/migration/migrator.rb

@@ -204,8 +204,8 @@ module Generators
             end
           end
           # generate shims for HABTM models
-          habtm_tables.each do |name, refls|
-            models_by_table_name[name] = ::DeclareSchema::Model::HabtmModelShim.from_reflection(refls.first)
+          habtm_tables.each do |name, reflections|
+            models_by_table_name[name] = ::DeclareSchema::Model::HabtmModelShim.from_reflection(reflections.first)
           end
           model_table_names = models_by_table_name.keys
 
@@ -352,7 +352,7 @@ module Generators
 
           db_columns = model.connection.columns(current_table_name).index_by(&:name)
           if (pk = model._declared_primary_key.presence)
-            pk_was_in_db_columns = db_columns.delete(pk)
+            pk_was_in_db_columns = pk.is_a?(Array) || db_columns.delete(pk)
           end
 
           model_column_names = model.field_specs.keys.map(&:to_s)

data/spec/lib/declare_schema/model/habtm_model_shim_spec.rb

@@ -11,6 +11,7 @@ RSpec.describe DeclareSchema::Model::HabtmModelShim do
   let(:join_table) { "customers_users" }
   let(:foreign_keys) { ["user_id", "customer_id"] }
   let(:parent_table_names) { ["users", "customers"] }
+  let(:connection) { instance_double(ActiveRecord::Base.connection.class, "connection") }
 
   before do
     load File.expand_path('../prepare_testapp.rb', __dir__)
@@ -30,7 +31,8 @@ RSpec.describe DeclareSchema::Model::HabtmModelShim do
                                               foreign_key: foreign_keys.first,
                                               association_foreign_key: foreign_keys.last,
                                               active_record: User,
-                                              class_name: 'Customer') }
+                                              class_name: 'Customer',
+                                              klass: Customer) }
       it 'returns a new object' do
         result = described_class.from_reflection(reflection)
 
@@ -42,9 +44,7 @@ RSpec.describe DeclareSchema::Model::HabtmModelShim do
   end
 
   describe 'instance methods' do
-    let(:connection) { instance_double(ActiveRecord::Base.connection.class, "connection") }
-
-    subject { described_class.new(join_table, foreign_keys, parent_table_names) }
+    subject { described_class.new(join_table, foreign_keys, parent_table_names, connection: connection) }
 
     describe '#initialize' do
       it 'stores initialization attributes' do

data/spec/lib/declare_schema_spec.rb

@@ -46,15 +46,14 @@ RSpec.describe DeclareSchema do
         let(:connection) { double("connection", select_value: "8.0.21") }
 
         it "is lazy, so it doesn't use the database connection until read" do
-          @connection_called = false
           expect(ActiveRecord::Base).to receive(:connection) do
             @connection_called = true
             connection
           end
           described_class.default_charset = "utf8"
-          expect(@connection_called).to eq(false)
+          expect(@connection_called).to be_falsey
           described_class.default_charset
-          expect(@connection_called).to eq(true)
+          expect(@connection_called).to be_truthy
         end
       end
     end
@@ -111,15 +110,14 @@ RSpec.describe DeclareSchema do
         let(:connection) { double("connection", select_value: "8.0.21") }
 
         it "is lazy, so it doesn't use the database connection until read" do
-          @connection_called = false
           expect(ActiveRecord::Base).to receive(:connection) do
             @connection_called = true
             connection
           end
           described_class.default_collation = "utf8_general_ci"
-          expect(@connection_called).to eq(false)
+          expect(@connection_called).to be_falsey
           described_class.default_collation
-          expect(@connection_called).to eq(true)
+          expect(@connection_called).to be_truthy
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: declare_schema
 version: !ruby/object:Gem::Version
-  version: 1.3.5.colin.1
+  version: 1.3.6.colin.1
 platform: ruby
 authors:
 - Invoca Development adapted from hobo_fields by Tom Locke
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-22 00:00:00.000000000 Z
+date: 2024-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails