declare_schema 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e5c665ec203dd84e445290bac1de190491560ddc409fe2bd3f5ba4831e065c5
-  data.tar.gz: 244148b892d2de22a692c4db50b136995f97d8da38573e87a443303fdee5be7a
+  metadata.gz: 2e1d3c68c4e9b2f6ce739eba37ed19c5f80204495a50a9240e9f1f68a09777e3
+  data.tar.gz: 63e0a3205c82c2b5e6dacbfbfd10e9aa2e63eee5898d11fd5c102618e73755aa
 SHA512:
-  metadata.gz: 44994fd571b97768ffec2c9bbce779b8beef222ba50213a425a3021c66f1dc4e4fd7a50adc95cf3d1a1116e67eaf5c47b11e635408856c726118a22c18188b98
-  data.tar.gz: 7d3eb3be095a1dce65b6b39b35974a6c96ee940fec31dba3fddbfb528be8be3b42906ec81c6075cde5d8fa590df4afc8ca12887a956c772fc34c084791577526
+  metadata.gz: 34ab74d97dd53c426d3a289b622670a42846d84279c2e3967ad0663c8f4871b1470a90b309237b09b09724a7e7c2405fb0f614a00d33902f8000bb1df23459ef
+  data.tar.gz: 2bf6ca852f71807e362ef26b4ba14d75b8a452a6245094eb8023fa1889b94d6584cf15856962f9fb85168208e0de4dd23a7942fb18cdcc5335f7c744382ba826

data/CHANGELOG.md

@@ -4,10 +4,15 @@ 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).
 
+## [0.4.1] - 2020-12-04
+### Fixed
+- Fixed a bug detecting compound primary keys in Rails 4.
+
 ## [0.4.0] - 2020-11-20
 ### Added
-- Fields may be declared with `serialize: true` or `serialize: <serializeable-class>`, where `<serializeable-class>` 
-may be `Array` (`Array` stored as YAML) or `Hash` (`Hash` stored as YAML), (`Array` or `Hash` or any scalar value stored as JSON)
+- Fields may be declared with `serialize: true` (any value with a valid `.to_yaml` stored as YAML),
+or `serialize: <serializeable-class>`, where `<serializeable-class>` 
+may be `Array` (`Array` stored as YAML) or `Hash` (`Hash` stored as YAML) or `JSON` (any value with a valid `.to_json`, stored as JSON)
 or any custom serializable class.
 This invokes `ActiveSupport`'s `serialize` macro for that field, passing the serializable class, if given.
 
@@ -55,11 +60,11 @@ using the appropriate Rails configuration attributes.
 ### Changed
 - Added travis support and created 2 specs as a starting point.
 
-
 ## [0.1.1] - 2020-09-24
 ### Added
 - Initial version from https://github.com/Invoca/hobo_fields v4.1.0.
 
+[0.4.1]: https://github.com/Invoca/declare_schema/compare/v0.4.0...v0.4.1
 [0.4.0]: https://github.com/Invoca/declare_schema/compare/v0.3.1...v0.4.0
 [0.3.1]: https://github.com/Invoca/declare_schema/compare/v0.3.0...v0.3.1
 [0.3.0]: https://github.com/Invoca/declare_schema/compare/v0.2.0...v0.3.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    declare_schema (0.4.0)
+    declare_schema (0.4.1)
       rails (>= 4.2)
 
 GEM
@@ -54,7 +54,7 @@ GEM
       thor (>= 0.14.0)
     arel (9.0.0)
     ast (2.4.1)
-    bootsnap (1.5.0)
+    bootsnap (1.5.1)
       msgpack (~> 1.0)
     builder (3.2.4)
     byebug (11.1.3)
@@ -69,7 +69,7 @@ GEM
       activesupport (>= 4.2.0)
     i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    listen (3.2.1)
+    listen (3.3.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     loofah (2.7.0)

data/lib/declare_schema/model/index_definition.rb

@@ -37,16 +37,9 @@ module DeclareSchema
         def for_model(model, old_table_name = nil)
           t = old_table_name || model.table_name
 
-          primary_key_columns = Array(model.connection.primary_key(t)).presence || begin
-            cols = model.connection.columns(t)
-            Array(
-              if cols.any? { |col| col.name == 'id' }
-                'id'
-              else
-                cols.find { |col| col.type.to_s.include?('int') }&.name or raise "could not guess primary key for #{t} in #{cols.inspect}"
-              end
-            )
-          end
+          primary_key_columns = Array(model.connection.primary_key(t)).presence || sqlite_compound_primary_key(model, t) or
+            raise "could not find primary key for table #{t} in #{model.connection.columns(t).inspect}"
+
           primary_key_found = false
           index_definitions = model.connection.indexes(t).map do |i|
             model.ignore_indexes.include?(i.name) and next
@@ -55,7 +48,8 @@ module DeclareSchema
                 raise "primary key on #{t} was not unique on #{primary_key_columns} (was unique=#{i.unique} on #{i.columns})"
               primary_key_found = true
             elsif i.columns == primary_key_columns && i.unique
-              raise "found primary key index on #{t}.#{primary_key_columns} but it was called #{i.name}"
+              # skip this primary key index since we'll create it below, with PRIMARY_KEY_NAME
+              next
             end
             new(model, i.columns, name: i.name, unique: i.unique, where: i.where, table_name: old_table_name)
           end.compact
@@ -65,6 +59,30 @@ module DeclareSchema
           end
           index_definitions
         end
+
+        private
+
+        # This is the old approach which is still needed for SQLite
+        def sqlite_compound_primary_key(model, table)
+          ActiveRecord::Base.connection.class.name.match?(/SQLite3Adapter/) or return nil
+
+          connection = model.connection.dup
+
+          class << connection   # defeat Rails MySQL driver code that skips the primary key by changing its name to a symbol
+            def each_hash(result)
+              super do |hash|
+                if hash[:Key_name] == PRIMARY_KEY_NAME
+                  hash[:Key_name] = PRIMARY_KEY_NAME.to_sym
+                end
+                yield hash
+              end
+            end
+          end
+
+          pk_index = connection.indexes(table).find { |index| index.name.to_s == PRIMARY_KEY_NAME } or return nil
+
+          Array(pk_index.columns)
+        end
       end
 
       def primary_key?

data/lib/declare_schema/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DeclareSchema
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/spec/lib/declare_schema/api_spec.rb

@@ -39,7 +39,7 @@ RSpec.describe 'DeclareSchema API' do
 
       load_models
 
-      unless Rails::VERSION::MAJOR >= 6
+      if Rails::VERSION::MAJOR == 5
         # TODO: get this to work on Travis for Rails 6
         generate_migrations '-n', '-m'
       end

data/spec/lib/declare_schema/migration_generator_spec.rb

@@ -43,6 +43,12 @@ RSpec.describe 'DeclareSchema Migration Generator' do
     ActiveRecord::Migration.class_eval(up)
     expect(Advert.columns.map(&:name)).to eq(["id", "name"])
 
+    if Rails::VERSION::MAJOR < 5
+      # Rails 4 sqlite driver doesn't create PK properly. Fix that by dropping and recreating.
+      ActiveRecord::Base.connection.execute("drop table adverts")
+      ActiveRecord::Base.connection.execute('CREATE TABLE "adverts" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255))')
+    end
+
     class Advert < ActiveRecord::Base
       fields do
         name :string, limit: 255, null: true
@@ -610,9 +616,8 @@ RSpec.describe 'DeclareSchema Migration Generator' do
     # Dropping tables is where the automatic down-migration really comes in handy:
 
     rails4_table_create = <<~EOS.strip
-      create_table "adverts", id: false, force: :cascade do |t|
-        t.integer "id",   limit: 8
-        t.string  "name", limit: 255
+      create_table "adverts", force: :cascade do |t|
+        t.string "name", limit: 255
       end
     EOS
 

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

@@ -13,16 +13,25 @@ RSpec.describe DeclareSchema::Model::IndexDefinition do
   before do
     load File.expand_path('../prepare_testapp.rb', __dir__)
 
-    class IndexSettingsTestModel < ActiveRecord::Base
+    class IndexDefinitionTestModel < ActiveRecord::Base
       fields do
         name :string, limit: 127, index: true
 
         timestamps
       end
     end
+
+    class IndexDefinitionCompoundIndexModel < ActiveRecord::Base
+      fields do
+        fk1_id :integer
+        fk2_id :integer
+
+        timestamps
+      end
+    end
   end
 
-  let(:model_class) { IndexSettingsTestModel }
+  let(:model_class) { IndexDefinitionTestModel }
 
   describe 'instance methods' do
     let(:model) { model_class.new }
@@ -53,13 +62,20 @@ RSpec.describe DeclareSchema::Model::IndexDefinition do
     context 'with a migrated database' do
       before do
         ActiveRecord::Base.connection.execute <<~EOS
-            CREATE TABLE index_settings_test_models (
+            CREATE TABLE index_definition_test_models (
               id INTEGER NOT NULL PRIMARY KEY,
               name TEXT NOT NULL
             )
         EOS
         ActiveRecord::Base.connection.execute <<~EOS
-          CREATE UNIQUE INDEX index_settings_test_models_on_name ON index_settings_test_models(name)
+          CREATE UNIQUE INDEX index_definition_test_models_on_name ON index_definition_test_models(name)
+        EOS
+        ActiveRecord::Base.connection.execute <<~EOS
+            CREATE TABLE index_definition_compound_index_models (
+              fk1_id INTEGER NULL,
+              fk2_id INTEGER NULL,
+              PRIMARY KEY (fk1_id, fk2_id)
+            )
         EOS
         ActiveRecord::Base.connection.schema_cache.clear!
       end
@@ -67,14 +83,38 @@ RSpec.describe DeclareSchema::Model::IndexDefinition do
       describe 'for_model' do
         subject { described_class.for_model(model_class) }
 
-        it 'returns the indexes for the model' do
-          expect(subject.size).to eq(2), subject.inspect
-          expect([:name, :columns, :unique].map { |attr| subject[0].send(attr) }).to eq(
-            ['index_settings_test_models_on_name', ['name'], true]
-          )
-          expect([:name, :columns, :unique].map { |attr| subject[1].send(attr) }).to eq(
-            ['PRIMARY', ['id'], true]
-          )
+        context 'with single-column PK' do
+          it 'returns the indexes for the model' do
+            expect(subject.size).to eq(2), subject.inspect
+            expect([:name, :columns, :unique].map { |attr| subject[0].send(attr) }).to eq(
+              ['index_definition_test_models_on_name', ['name'], true]
+            )
+            expect([:name, :columns, :unique].map { |attr| subject[1].send(attr) }).to eq(
+              ['PRIMARY', ['id'], true]
+            )
+          end
+        end
+
+        context 'with compound-column PK' do
+          let(:model_class) { IndexDefinitionCompoundIndexModel }
+
+          it 'returns the indexes for the model' do
+            # Simulate MySQL for Rails 4 work-around
+            if Rails::VERSION::MAJOR < 5
+              expect(model_class.connection).to receive(:primary_key).with('index_definition_compound_index_models').and_return(nil)
+              connection_stub = instance_double(ActiveRecord::ConnectionAdapters::SQLite3Adapter, "connection")
+              expect(connection_stub).to receive(:indexes).
+                with('index_definition_compound_index_models').
+                and_return([DeclareSchema::Model::IndexDefinition.new(model_class, ['fk1_id', 'fk2_id'], name: 'PRIMARY')])
+
+              expect(model_class.connection).to receive(:dup).and_return(connection_stub)
+            end
+
+            expect(subject.size).to eq(1), subject.inspect
+            expect([:name, :columns, :unique].map { |attr| subject[0].send(attr) }).to eq(
+              ['PRIMARY', ['fk1_id', 'fk2_id'], true]
+            )
+          end
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: declare_schema
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Invoca Development adapted from hobo_fields by Tom Locke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-20 00:00:00.000000000 Z
+date: 2020-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails