declare_schema 1.3.4 → 1.3.5.colin.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f5ae7cf20a27eeced3466430509637a9df81ff7456678b129333392bb317985
-  data.tar.gz: cb1b3ddef5eefac4eb1f8bacbe62751900f869ea8577932ab85cd1c2b2cbc59e
+  metadata.gz: b87dca056e85242e1d681247cce6acdfcc9ff4896f5e74e8f170aad94ad92172
+  data.tar.gz: 9169a1be8735996bb9a1c9a22ed8af926dbe99a405c4fee9f679263823603423
 SHA512:
-  metadata.gz: 11150b8dc1fd0a21c5b6ea2570a4bc12ce87eb4b48fa9926f67cb61537c26dc1156061b6308f796029bd9d2caeea632b71b0f28198b7a20e0959ccb1c7369f7c
-  data.tar.gz: 30d9e498f22dbb47c2f10f7d107d257ccae6b507bb6a5cd82d17c18e0074723e7551223f75bd4335f5a7453017016774fb1a10739484fdd713fa2aae91175f81
+  metadata.gz: ca2d456cffd1cfb8a6413dfe228078568d476804818d0103a5ebda165f99ea5c7851d0def54026c8f2a0268726a34c2e783d50079ab05782b7e55b25092623d6
+  data.tar.gz: e0ba451918f3814de9c7534cbd0a6e0db8a82621ae03614957b7cf6278c79a6d272e6f241a1324c85fb175d1ceb56b93f04a756280827ee0facaccbecb3d32b5

data/CHANGELOG.md

@@ -4,6 +4,11 @@ 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.5] - 2024-01-22
+### Fixed
+- Make `default_charset=` and `default_collation=` lazy so they don't use the database connection to check the
+  MySQL version. Instead, that is checked the first time `default_charset` or `default_collation` is called.
+
 ## [1.3.4] - 2024-01-18
 ### Fixed
 - Add test for migrating `has_and_belongs_to_many` associations and fix them to properly declare their

data/Gemfile.lock

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

data/lib/declare_schema/version.rb

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

data/lib/declare_schema.rb

@@ -36,7 +36,7 @@ module DeclareSchema
 
   class << self
     attr_writer :mysql_version
-    attr_reader :default_charset, :default_collation, :default_text_limit, :default_string_limit, :default_null,
+    attr_reader :default_text_limit, :default_string_limit, :default_null,
                 :default_generate_foreign_keys, :default_generate_indexing, :db_migrate_command,
                 :max_index_and_constraint_name_length
 
@@ -81,12 +81,22 @@ module DeclareSchema
 
     def default_charset=(charset)
       charset.is_a?(String) or raise ArgumentError, "charset must be a string (got #{charset.inspect})"
-      @default_charset = normalize_charset(charset)
+      @default_charset_before_normalization = charset
+      @default_charset = nil
+    end
+
+    def default_charset
+      @default_charset || normalize_charset(@default_charset_before_normalization)
     end
 
     def default_collation=(collation)
       collation.is_a?(String) or raise ArgumentError, "collation must be a string (got #{collation.inspect})"
-      @default_collation = normalize_collation(collation)
+      @default_collation_before_normalization = collation
+      @default_collation = nil
+    end
+
+    def default_collation
+      @default_collation || normalize_collation(@default_collation_before_normalization)
     end
 
     def default_text_limit=(text_limit)

data/spec/lib/declare_schema_spec.rb

@@ -37,6 +37,27 @@ RSpec.describe DeclareSchema do
         it     { is_expected.to eq("utf8mb3") }
       end
     end
+
+    context 'when MySQL version not known yet' do
+      before { described_class.remove_instance_variable('@mysql_version') rescue nil }
+      after { described_class.remove_instance_variable('@mysql_version') rescue nil }
+
+      context 'when set' 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)
+          described_class.default_charset
+          expect(@connection_called).to eq(true)
+        end
+      end
+    end
   end
 
   describe '#default_collation' do
@@ -81,6 +102,27 @@ RSpec.describe DeclareSchema do
         it     { is_expected.to eq("utf8mb3_general_ci") }
       end
     end
+
+    context 'when MySQL version not known yet' do
+      before { described_class.remove_instance_variable('@mysql_version') rescue nil }
+      after { described_class.remove_instance_variable('@mysql_version') rescue nil }
+
+      context 'when set' 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)
+          described_class.default_collation
+          expect(@connection_called).to eq(true)
+        end
+      end
+    end
   end
 
   describe '#default_text_limit' do

metadata

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