activerecord-postgres_enum 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d36ad353392d74fe6bdd5aaeb03cc682cb0f84205b5502ecff4681dd5833afb
-  data.tar.gz: 3c854bb369675b9a188dc8b102d35053fbe942f5939ea8675ea0fb3cfe3f9848
+  metadata.gz: 1b774ca52773f7346d01b9db6bf6b5a914c10253597c6796f6b6619612dfba64
+  data.tar.gz: 92c8bfb4e74845ce4a44d381c775b9443a22e2d091a55904d3deb7d2c0d5d0bc
 SHA512:
-  metadata.gz: 8a95d1362c9bd42e9201c386e26908d3cb0ea7162554a2fd81e5d1b102ff4087d6b47dd5966d3770e00efea5d18e7e8438947f55118057b6dc223d4a070d8ccd
-  data.tar.gz: 827677270881d6e14b394fa043d8c40c6ac2f789f791d484ddf7f0d7f1cbdba365840b3c8e370002c3fb56db46a7f1ce493cb1a9d27fd2f99c4ccae9ad27cfb8
+  metadata.gz: 716129b56fd13a1630fb6de9fb0a74608921dcad4e35e47523bc0c2c901fb72aa202eb95f483bd0a0bcd2a1f2fd1cbeb3603fa6b80791274d30688bf82e3417a
+  data.tar.gz: a8c8a21b0164e61d16d2e3ef5ed3d2726bed463ddc0f63dcf36e9b60cb5bed87f699a4a639f68d642b0f11d63a13a057d8113417479091b93b91166dc64eb9b0

data/README.md

@@ -36,7 +36,7 @@ create_table :person do
 end
 ```
 
-Running the above will create a table :person, with a column :person_mood of type :mood. This will also be saved on schema.rb so that `rake schema:load` works as expected.
+Running the above will create a table :person, with a column :person_mood of type :mood. This will also be saved on schema.rb so that `rake db:schema:load` works as expected.
 
 To drop an existing enum:
 
@@ -85,7 +85,7 @@ rename_enum_value :mood, "pensive", "wistful"
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rspec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 

data/lib/active_record/postgres_enum/column.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-# frozen_string_literal: true
-
 module ActiveRecord
   module PostgresEnum
     module Column

data/lib/active_record/postgres_enum/command_recorder.rb

@@ -3,7 +3,7 @@
 module ActiveRecord
   module PostgresEnum
     module CommandRecorder
-      def create_enum(name, values)
+      def create_enum(name, values, _opts = nil)
         record(:create_enum, [name, values])
       end
 

data/lib/active_record/postgres_enum/postgresql_adapter.rb

@@ -10,8 +10,10 @@ module ActiveRecord
           t.typtype,
           array_to_string(array_agg(e.enumlabel ORDER BY e.enumsortorder), '\t\t', '') as enumlabels
         FROM pg_type t
+        INNER JOIN pg_namespace n ON n.oid = t.typnamespace
         LEFT JOIN pg_enum e ON e.enumtypid = t.oid
-        WHERE typtype = 'e'
+        WHERE t.typtype = 'e'
+        AND n.nspname = ANY(current_schemas(true))
         GROUP BY t.OID, t.typname, t.typtype
         ORDER BY t.typname
       SQL
@@ -58,8 +60,12 @@ module ActiveRecord
       def remove_enum_value(name, value)
         sql = %{
           DELETE FROM pg_enum
-          WHERE enumlabel=#{quote value}
-          AND enumtypid=(SELECT oid FROM pg_type WHERE typname='#{name}')
+          WHERE enumlabel = #{quote value}
+          AND enumtypid IN (SELECT t.oid
+                            FROM pg_type t
+                            INNER JOIN pg_namespace n ON n.oid = t.typnamespace
+                            WHERE t.typname = '#{name}'
+                            AND n.nspname = ANY(current_schemas(true)))
         }
         execute sql
       end

data/lib/active_record/postgres_enum/schema_dumper.rb

@@ -22,8 +22,12 @@ module ActiveRecord
             statements << "  create_enum #{name.inspect}, [\n#{values}\n  ], force: :cascade"
           end
 
-          stream.puts statements.join("\n\n")
-          stream.puts
+          # Check if there any enum types to dump - otherwise don't output
+          # anything to prevent empty lines in schema.rb
+          if statements.any?
+            stream.puts statements.join("\n\n")
+            stream.puts
+          end
         end
       end
 

data/lib/active_record/postgres_enum/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveRecord
   module PostgresEnum
-    VERSION = "2.0.1"
+    VERSION = "2.1.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgres_enum
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Michael Merkushin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-24 00:00:00.000000000 Z
+date: 2024-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -168,7 +168,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="