support postGIS adapter for postgreSQL

remove puts rename changelog change wording in changelog update pr number Update lib/rubocop/cop/rails/bulk_change_table.rb Co-authored-by: Koichi ITO <[email protected]> Update changelog/new_support_postgis_adapter_for_postgresql.md Co-authored-by: Koichi ITO <[email protected]>
rubocop · Nov 17, 2023 · 8528cf7 · 8528cf7
1 parent c176f6b
commit 8528cf7
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 3 deletions.
diff --git a/changelog/new_support_postgis_adapter_for_postgresql.md b/changelog/new_support_postgis_adapter_for_postgresql.md
@@ -0,0 +1 @@
+* [#1183](https://github.com/rubocop/rubocop-rails/pull/1183): Support PostGIS adapter for PostgreSQL. ([@Dania02525][])
diff --git a/docs/modules/ROOT/pages/cops_rails.adoc b/docs/modules/ROOT/pages/cops_rails.adoc
@@ -977,7 +977,7 @@ the PostgreSQL (5.2 later) adapter; thus it will
 automatically detect an adapter from `development` environment
 in `config/database.yml` or the environment variable `DATABASE_URL`
 when the `Database` option is not set.
-If the adapter is not `mysql2`, `trilogy`, or `postgresql`,
+If the adapter is not `mysql2`, `trilogy`, `postgresql`, or `postgis`,
 this Cop ignores offenses.
 
 === Examples

diff --git a/lib/rubocop/cop/mixin/database_type_resolvable.rb b/lib/rubocop/cop/mixin/database_type_resolvable.rb
@@ -23,7 +23,7 @@ def database_from_yaml
         case database_adapter
         when 'mysql2', 'trilogy'
           MYSQL
-        when 'postgresql'
+        when 'postgresql', 'postgis'
           POSTGRESQL
         end
       end

diff --git a/lib/rubocop/cop/rails/bulk_change_table.rb b/lib/rubocop/cop/rails/bulk_change_table.rb
@@ -14,7 +14,7 @@ module Rails
       # automatically detect an adapter from `development` environment
       # in `config/database.yml` or the environment variable `DATABASE_URL`
       # when the `Database` option is not set.
-      # If the adapter is not `mysql2`, `trilogy`, or `postgresql`,
+      # If the adapter is not `mysql2`, `trilogy`, `postgresql`, or `postgis`,
       # this Cop ignores offenses.
       #
       # @example

diff --git a/spec/rubocop/cop/rails/bulk_change_table_spec.rb b/spec/rubocop/cop/rails/bulk_change_table_spec.rb
@@ -547,6 +547,46 @@ def change
       end
     end
 
+    context 'postgis' do
+      context 'with top-level adapter configuration' do
+        let(:yaml) do
+          {
+            'development' => {
+              'adapter' => 'postgis'
+            }
+          }
+        end
+
+        context 'with Rails 5.2', :rails52 do
+          it_behaves_like 'offense for postgresql'
+        end
+
+        context 'with Rails 5.1', :rails51 do
+          it_behaves_like 'no offense for postgresql'
+        end
+      end
+
+      context 'with nested adapter configuration' do
+        let(:yaml) do
+          {
+            'development' => {
+              'primary' => {
+                'adapter' => 'postgis'
+              }
+            }
+          }
+        end
+
+        context 'with Rails 5.2', :rails52 do
+          it_behaves_like 'offense for postgresql'
+        end
+
+        context 'with Rails 5.1', :rails51 do
+          it_behaves_like 'no offense for postgresql'
+        end
+      end
+    end
+
     context 'invalid (e.g. ERB)' do
       before do
         allow(YAML).to receive(:load_file).with('config/database.yml') do