annotaterb 4.9.0 → 4.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09caaf3fa0cb79967a6273386ea6e181e6f22c614ea2e43da32b67abe877cf95'
-  data.tar.gz: a0181d18310997f66cfb79f3e0d3fdb030708ff55c7492f2821d9024126c3f55
+  metadata.gz: ab40ea1034e6f377865be3de919a8df7f32cd6b655def53590b4061389ce518a
+  data.tar.gz: 1cc47f8f90e22930b7267727de068bacda45f0596df6bd15459c9d935e86f1f0
 SHA512:
-  metadata.gz: 5be5ad218586f3a24854edc995ddaf3334507a46c54bfa28325e71706a502a2ce1ca5b8aa53822cf40d51724f16cb9086ea480e61aba7954e916c270484763d5
-  data.tar.gz: 9ab288486df138231ad168161238e08442b9b80e7b6f06adc21266d0ce002116bf7035313213e6a2db7df743e5f731e0ef2b18df43993837aa4debbf0f9137fd
+  metadata.gz: fed4abbcf53babf0b3854eacfb85078eb36716e2ddaaefa112e174c28f8a9694137f4fbe5b3e4ac73fc30f7b9786308a6770f62e692e101c676fee7ff3af6801
+  data.tar.gz: b41107dd5b24a83f3c50e890eb24491665aa07253be3bf6e79caec4ab1ee898888ef84192ba691064a158cc4672ccfb7db18416970f61ce0add026a81e9116b9

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## [v4.9.0](https://github.com/drwl/annotaterb/tree/v4.9.0) (2024-05-29)
+
+[Full Changelog](https://github.com/drwl/annotaterb/compare/v4.8.0...v4.9.0)
+
+**Closed issues:**
+
+- Duplicate content in fixtures when annotating models [\#108](https://github.com/drwl/annotaterb/issues/108)
+- Cannot exclude annotations from serializer specs [\#103](https://github.com/drwl/annotaterb/issues/103)
+
+**Merged pull requests:**
+
+- Bump version to v4.9.0 [\#119](https://github.com/drwl/annotaterb/pull/119) ([drwl](https://github.com/drwl))
+- Add support for `NOT VALID` constraints [\#118](https://github.com/drwl/annotaterb/pull/118) ([gmcabrita](https://github.com/gmcabrita))
+- Generate changelog for v4.8.0 [\#116](https://github.com/drwl/annotaterb/pull/116) ([drwl](https://github.com/drwl))
+
 ## [v4.8.0](https://github.com/drwl/annotaterb/tree/v4.8.0) (2024-05-14)
 
 [Full Changelog](https://github.com/drwl/annotaterb/compare/v4.7.1...v4.8.0)

data/VERSION

@@ -1 +1 @@
-4.9.0
+4.10.0

data/lib/annotate_rb/model_annotator/foreign_key_annotation/annotation_builder.rb

@@ -23,14 +23,19 @@ module AnnotateRb
           return "" if foreign_keys.empty?
 
           format_name = lambda do |fk|
-            return fk.options[:column] if fk.name.blank?
+            return fk.column if fk.name.blank?
 
             @options[:show_complete_foreign_keys] ? fk.name : fk.name.gsub(/(?<=^fk_rails_)[0-9a-f]{10}$/, "...")
           end
 
           max_size = foreign_keys.map(&format_name).map(&:size).max + 1
-          foreign_keys.sort_by { |fk| [format_name.call(fk), fk.column] }.each do |fk|
-            ref_info = "#{fk.column} => #{fk.to_table}.#{fk.primary_key}"
+          foreign_keys.sort_by { |fk| [format_name.call(fk), stringify_columns(fk.column)] }.each do |fk|
+            ref_info = if fk.column.is_a?(Array) # Composite foreign key using multiple columns
+              "#{stringify_columns(fk.column)} => #{fk.to_table}#{stringify_columns(fk.primary_key)}"
+            else
+              "#{fk.column} => #{fk.to_table}.#{fk.primary_key}"
+            end
+
             constraints_info = ""
             constraints_info += "ON DELETE => #{fk.on_delete} " if fk.on_delete
             constraints_info += "ON UPDATE => #{fk.on_update} " if fk.on_update
@@ -51,6 +56,13 @@ module AnnotateRb
 
           fk_info
         end
+
+        private
+
+        # The fk columns might be composite keys, so format them into a string for the annotation
+        def stringify_columns(columns)
+          columns.is_a?(Array) ? "[#{columns.join(", ")}]" : columns
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: annotaterb
 version: !ruby/object:Gem::Version
-  version: 4.9.0
+  version: 4.10.0
 platform: ruby
 authors:
 - Andrew W. Lee
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-29 00:00:00.000000000 Z
+date: 2024-06-28 00:00:00.000000000 Z
 dependencies: []
 description: Annotates Rails/ActiveRecord Models, routes, fixtures, and others based
   on the database schema.