db_auto_migrations 1.0.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df6c792de2c4c0f0b66a8b3820e90c3009a50cdbce199fd1131cb0de91e6d0cc
-  data.tar.gz: 67a006293c936f44c594180e32510fa4dba8b97fef80a8aac436316c4ab3c870
+  metadata.gz: a5272025e67595659eda471e791a719c5c0fb183a5ccdad06ba369bd6994d850
+  data.tar.gz: 881d42074270490280868e3d8b75a5d63de6c7676681b99c191af716a1277611
 SHA512:
-  metadata.gz: 93296e2066d8659e27f97bea67ddbbf3d8629f8203e8302d8fc9d608c4e216992c36a336fc07a50cf25272044faff5c64c804003cb0f49a94948b5b90c37c2ee
-  data.tar.gz: ff3cb880fb309b4c50628aa9c4a3b1f5c80584bf09f4ba76ec96378bd51428ff70e2356be0f6f63ccb841190a50733cce38c38e31794f61a46fe2b23d9383f3e
+  metadata.gz: 8e6dcc9cb708510d5805ca3b635559ac0a5433d78bd312bd3bde04cb916fda5c2fa352bd3f956c302face70425398479ee018c47f19e9d271059f02c1bafb263
+  data.tar.gz: 12a4f1a0ee28e691ca427a86814e0c1aea7f47fa257bc840f55479cf41bb93f8e9a647fd2564a6d243bdc29baa5bf5575e5c96f32714e7fe2ce8d6640889688c

data/VERSION

@@ -1 +1 @@
-1.0.1
+2.0.0

data/db_auto_migrations.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: db_auto_migrations 1.0.1 ruby lib
+# stub: db_auto_migrations 2.0.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "db_auto_migrations".freeze
-  s.version = "1.0.1"
+  s.version = "2.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["sai (originally by PJ Hyett)".freeze]
-  s.date = "2021-12-07"
+  s.date = "2021-12-08"
   s.description = "Auto database migration.".freeze
   s.email = "rubyer1993@gmail.com".freeze
   s.executables = ["setup".freeze]

data/lib/db_auto_migrations.rb

@@ -2,7 +2,6 @@
 Dir[File.join(File.dirname(__FILE__),'tasks/**/*.rake')].each { |f| load f } if defined?(Rake)
 
 module AutoMigrations
-  
   def self.run
     # Turn off schema_info code for auto-migration
     class << ActiveRecord::Schema
@@ -10,29 +9,29 @@ module AutoMigrations
       attr_accessor :version
       def define(info={}, &block) @version = Time.now.utc.strftime("%Y%m%d%H%M%S"); instance_eval(&block) end
     end
-  
+
     load(File.join(Rails.root, 'db', 'schema.rb'))
     ActiveRecord::Migration.drop_unused_tables
     ActiveRecord::Migration.drop_unused_indexes
     ActiveRecord::Migration.update_schema_version(ActiveRecord::Schema.version) if ActiveRecord::Schema.version
-  
+
     class << ActiveRecord::Schema
       alias :define :old_define
     end
   end
-  
+
   def self.schema_to_migration(with_reset = false)
     schema_in = File.read(File.join(Rails.root, "db", "schema.rb"))
     schema_in.gsub!(/#(.)+\n/, '')
     schema_in.sub!(/ActiveRecord::Schema.define(.+)do[ ]?\n/, '')
     schema_in.gsub!(/^/, '  ')
-    schema = "class InitialSchema < ActiveRecord::Migration\n  def self.up\n" 
+    schema = "class InitialSchema < ActiveRecord::Migration\n  def self.up\n"
     schema += "    # We're resetting the migrations database...\n" +
               "    drop_table :schema_migrations\n" +
               "    initialize_schema_migrations_table\n\n" if with_reset
     schema += schema_in
     schema << "\n  def self.down\n"
-    schema << (ActiveRecord::Base.connection.tables - %w(schema_info schema_migrations)).map do |table| 
+    schema << ((ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Base.connection.data_sources : ActiveRecord::Base.connection.tables) - %w(schema_info schema_migrations)).map do |table|
                 "    drop_table :#{table}\n"
               end.join
     schema << "  end\nend\n"
@@ -40,18 +39,19 @@ module AutoMigrations
     File.open(migration_file, "w") { |f| f << schema }
     puts "Migration created at db/migrate/001_initial_schema.rb"
   end
-  
+
   def self.included(base)
     base.extend ClassMethods
     class << base
       cattr_accessor :tables_in_schema, :indexes_in_schema
       self.tables_in_schema, self.indexes_in_schema = [], []
-      alias_method_chain :method_missing, :auto_migration
+      alias_method :method_missing_without_auto_migration, :method_missing
+      alias_method :method_missing, :method_missing_with_auto_migration
     end
   end
 
   module ClassMethods
-  
+
     def method_missing_with_auto_migration(method, *args, &block)
       case method
       when :create_table
@@ -59,29 +59,29 @@ module AutoMigrations
       when :add_index
         auto_add_index(method, *args, &block)
       else
-        method_missing_without_auto_migration(method, *args, &block) 
+        method_missing_without_auto_migration(method, *args, &block)
       end
     end
-    
+
     def auto_create_table(method, *args, &block)
-      table_name = args.shift.to_s    
+      table_name = args.shift.to_s
       options    = args.pop || {}
-        
+
       (self.tables_in_schema ||= []) << table_name
 
       # Table doesn't exist, create it
-      unless ActiveRecord::Base.connection.tables.include?(table_name)
+      unless (ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Base.connection.data_sources : ActiveRecord::Base.connection.tables).include?(table_name)
         return method_missing_without_auto_migration(method, *[table_name, options], &block)
       end
-    
+
       # Grab database columns
       fields_in_db = ActiveRecord::Base.connection.columns(table_name).inject({}) do |hash, column|
         hash[column.name] = column
         hash
       end
-    
+
       # Grab schema columns (lifted from active_record/connection_adapters/abstract/schema_statements.rb)
-      table_definition = ActiveRecord::ConnectionAdapters::TableDefinition.new(ActiveRecord::Base.connection)
+      table_definition = create_table_definition table_name, options[:temporary], options[:options]
       primary_key = options[:primary_key] || "id"
       table_definition.primary_key(primary_key) unless options[:id] == false
       yield table_definition
@@ -89,7 +89,7 @@ module AutoMigrations
         hash[column.name.to_s] = column
         hash
       end
-    
+
       # Add fields to db new to schema
       (fields_in_schema.keys - fields_in_db.keys).each do |field|
         column  = fields_in_schema[field]
@@ -98,13 +98,13 @@ module AutoMigrations
         options[:null]    = column.null    if !column.null.nil?
         add_column table_name, column.name, column.type.to_sym, options
       end
-    
+
       # Remove fields from db no longer in schema
       (fields_in_db.keys - fields_in_schema.keys & fields_in_db.keys).each do |field|
         column = fields_in_db[field]
         remove_column table_name, column.name
       end
-      
+
       (fields_in_schema.keys & fields_in_db.keys).each do |field|
         if field != primary_key #ActiveRecord::Base.get_primary_key(table_name)
           changed  = false  # flag
@@ -118,16 +118,18 @@ module AutoMigrations
 
           # Special catch for precision/scale, since *both* must be specified together
           # Always include them in the attr struct, but they'll only get applied if changed = true
-          new_attr[:precision] = fields_in_schema[field][:precision]
-          new_attr[:scale]     = fields_in_schema[field][:scale]
+          new_attr[:precision] = fields_in_schema[field].precision
+          new_attr[:scale]     = fields_in_schema[field].scale
 
           # Next, iterate through our extended attributes, looking for any differences
           # This catches stuff like :null, :precision, etc
-          fields_in_schema[field].each_pair do |att,value|
-            next if att == :type or att == :base or att == :name # special cases
+          fields_in_schema[field][:options].each_pair do |att,value|
+            next unless [:limit, :precision, :scale, :default, :null, :collation, :comment].include?(att)
+
             if !value.nil?
               value_in_db = fields_in_db[field].send(att)
               value_in_db = value_in_db.to_i if att == :default && new_type == :integer && value_in_db.class == String
+              value_in_db = value_in_db.to_f if att == :default && new_type == :float && value_in_db.class == String
               if att == :default && new_type == :boolean && value_in_db.class == String
                 value_in_db_to_i = value_in_db.to_i
                 value_in_db = false if value_in_db_to_i == 0
@@ -138,7 +140,7 @@ module AutoMigrations
                 new_attr[att] = value
                 changed = true
               end
-            end 
+            end
           end
 
           # Change the column if applicable
@@ -146,13 +148,13 @@ module AutoMigrations
         end
       end
     end
-    
-    def auto_add_index(method, *args, &block)      
+
+    def auto_add_index(method, *args, &block)
       table_name = args.shift.to_s
       fields     = Array(args.shift).map(&:to_s)
       options    = args.shift
 
-      index_name = options[:name] if options  
+      index_name = options[:name] if options
       index_name ||= ActiveRecord::Base.connection.index_name(table_name, :column => fields)
 
       (self.indexes_in_schema ||= []) << index_name
@@ -161,13 +163,13 @@ module AutoMigrations
         method_missing_without_auto_migration(method, *[table_name, fields, options], &block)
       end
     end
-  
+
     def drop_unused_tables
-      (ActiveRecord::Base.connection.tables - tables_in_schema - %w(schema_info schema_migrations)).each do |table|
+      ((ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Base.connection.data_sources : ActiveRecord::Base.connection.tables) - tables_in_schema - %w(schema_info schema_migrations)).each do |table|
         drop_table table
       end
     end
-    
+
     def drop_unused_indexes
       tables_in_schema.each do |table_name|
         indexes_in_db = ActiveRecord::Base.connection.indexes(table_name).map(&:name)
@@ -176,9 +178,9 @@ module AutoMigrations
         end
       end
     end
-    
+
     def update_schema_version(version)
-      if ActiveRecord::Base.connection.tables.include?("schema_migrations")
+      if (ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Base.connection.data_sources : ActiveRecord::Base.connection.tables).include?("schema_migrations")
         ActiveRecord::Base.connection.update("INSERT INTO schema_migrations VALUES ('#{version}')")
       end
       schema_file = File.join(Rails.root, "db", "schema.rb")
@@ -186,9 +188,12 @@ module AutoMigrations
       schema.sub!(/:version => \d+/, ":version => #{version}")
       File.open(schema_file, "w") { |f| f << schema }
     end
-  
-  end
 
+    private
+    def create_table_definition(name, temporary, options)
+      ActiveRecord::ConnectionAdapters::TableDefinition.new({}, name, temporary, options)
+    end
+  end
 end
 
 ActiveRecord::Migration.send :include, AutoMigrations

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: db_auto_migrations
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0
 platform: ruby
 authors:
 - sai (originally by PJ Hyett)
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-07 00:00:00.000000000 Z
+date: 2021-12-08 00:00:00.000000000 Z
 dependencies: []
 description: Auto database migration.
 email: rubyer1993@gmail.com