bard-rake 0.18.0 → 0.18.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cef03634f53844e05848762de6241e42ccbf4ec3036c505f58e24dc3492826cf
-  data.tar.gz: c1ad30e5b5e7cb68593a07bb8d9ef0d87b3cc260a1f5aa79ae68bd6bc9de6101
+  metadata.gz: 38773c410d093bc039c0ffd18bba5cb685a386950bc79637663d236bde41f084
+  data.tar.gz: 79cecaa68b6db7e870ba3fd0abe43155ac6b9301d119d83bedced297b2cdc95b
 SHA512:
-  metadata.gz: 7136e73f23f0c82e3fe94467b29d958377825dce071e9293c7f5b24062d4ab2579d3f8abce59b67b2b5ef8ce64b1768eab82d5e764d426d7ee61e7a0b720c8ae
-  data.tar.gz: 8b55fa6283e4450ef582103d5f6ce299d25a8e8e158e7e84d5563b5e8dee74c001fa7562f45a613fce3c1834cd1cb30f78ec6d1fc3eb75e6ea034c0395f02f44
+  metadata.gz: a6acaddff47bb7c664f04c050d7d3df6b07fac32b140250f0a504ede020da0754107881597ae36edf2ede949e39a8e9176bdbda49b9ff19ce4e964dc12ea4161
+  data.tar.gz: f94310bfa99cc38d836f719a2d326276108eb748d84283912e68d7ea56a445f3f571295fa0e76613bced6fadda0b525e8c2358ad8f337b549e10772d85d79a77

data/lib/bard/rake/db_dump_load.rb

@@ -17,15 +17,23 @@ if defined?(ActiveRecord)
   namespace :db do
     namespace :create do
       task :current => :load_config do
-        config = ActiveRecord::Tasks::DatabaseTasks.current_config
-        ActiveRecord::Tasks::DatabaseTasks.create config
+        if ActiveRecord::Tasks::DatabaseTasks.respond_to?(:current_config)
+          config = ActiveRecord::Tasks::DatabaseTasks.current_config
+          ActiveRecord::Tasks::DatabaseTasks.create config
+        else
+          ActiveRecord::Tasks::DatabaseTasks.create_current Rails.env
+        end
       end
     end
 
     namespace :drop do
       task :current => :load_config do
-        config = ActiveRecord::Tasks::DatabaseTasks.current_config
-        ActiveRecord::Tasks::DatabaseTasks.drop config
+        if ActiveRecord::Tasks::DatabaseTasks.respond_to?(:current_config)
+          config = ActiveRecord::Tasks::DatabaseTasks.current_config
+          ActiveRecord::Tasks::DatabaseTasks.drop config
+        else
+          ActiveRecord::Tasks::DatabaseTasks.drop_current Rails.env
+        end
       end
     end
   end

data/lib/bard/rake/db_multiple_environment_sanity.rb

@@ -56,8 +56,13 @@ if defined?(ActiveRecord)
 
       ActiveRecord::Base.configurations.configs_for.each do |db_config|
         env = db_config.env_name
-        configuration = db_config.config
-        database = configuration["database"]
+        if Rails.version < "7"
+          configuration = db_config.config
+          database = configuration["database"]
+        else
+          configuration = db_config.configuration_hash
+          database = configuration[:database]
+        end
 
         next unless database
         next unless whitelist.include?(env)

data/lib/bard/rake/version.rb

@@ -1,6 +1,6 @@
 module Bard
   module Rake
-    VERSION = "0.18.0"
+    VERSION = "0.18.3"
   end
 end
 

data/lib/generators/bard/utf8mb4_migration/templates/migration.rb.tt

@@ -30,7 +30,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi
   end
 
   def collation
-    "utf8mb4_general_ci"
+    "utf8mb4_unicode_ci"
   end
 
   def db

data/lib/generators/bard/utf8mb4_migration/utf8mb4_migration_generator.rb

@@ -17,9 +17,7 @@ module Bard
 
     def specify_charset_and_collation_in_database_yml
       ["config/database.yml", "config/database.sample.yml"].each do |file|
-        ["  collation: utf8mb4_general_ci\n", "  charset: utf8mb4\n"].each do |line|
-          inject_into_file file, line, after: "  socket: /var/run/mysqld/mysqld.sock\n"
-        end
+        inject_into_file file, "  charset: utf8mb4\n", after: "  socket: /var/run/mysqld/mysqld.sock\n"
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bard-rake
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.18.3
 platform: ruby
 authors:
 - Micah Geisel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-30 00:00:00.000000000 Z
+date: 2022-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake