db-evolve 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df4390a732399e47e5810e40f119ffc1dfaf48b2
-  data.tar.gz: 9d90300f7b49ad447022b53320b3d88b14b39bbc
+  metadata.gz: 694c48e78daf4ddf885edf8bf20889058bc298cd
+  data.tar.gz: ac15d6126a72447c50b4d83ea9fe5631b7fb8315
 SHA512:
-  metadata.gz: c433eed0a2d0df2b78438ef62ec61b91c0d303aff4ccb26b3399f96f64311296f424990d7701753ae7dcc9c27a4cb1cb4a573dd5c26c73783261cd97efc4c5d6
-  data.tar.gz: 653cf0759eeae31361ab782e8b2660de2cdd2c18177f3d52222945a7ac7705916e18ef527463ff619a1efa067cebca4c3adc8bd683386af3424eea7d250e5e63
+  metadata.gz: 66620868e04882314151f08f9f3a739158c3dc016b4e6dd17cd3068d904a0c1f3188838a1ed4416404618d4266b985502f9e31d5cb45761d22de8f79fb0c708f
+  data.tar.gz: 62f3056ed8d5d15d0c57fd6b2a4bb9e1ae1f4aa8befe88e2d08f044b9983d383cf7e75e6d728dc145109f43e27065505e0202584c73c081131c8647f7e01b5a6

data/lib/tasks/db.rb

@@ -105,7 +105,7 @@ def do_evolve(noop, yes, nowait)
   
   to_run += calc_index_changes(existing_indexes, $schema_indexes, renames, rename_cols_by_table)
 
-  to_run += calc_fk_changes($foreign_keys, Set.new($schema_tables.keys) + Set.new(existing_tables.keys))
+  to_run += calc_fk_changes($foreign_keys, Set.new(existing_tables.keys), renames)
 
   to_run += calc_perms_changes($schema_tables, noop) unless $check_perms_for.empty?
 
@@ -169,6 +169,11 @@ end
 def calc_index_changes(existing_indexes, schema_indexes, table_renames, rename_cols_by_table)
   # rename_cols_by_table is by the new table name
   existing_indexes = Set.new existing_indexes
+  existing_indexes.each do |index|
+    if table_renames[index[:table]].present?
+      index[:table] = table_renames[index[:table]]
+    end
+  end
   schema_indexes = Set.new schema_indexes
   
   add_indexes = schema_indexes - existing_indexes
@@ -201,10 +206,10 @@ def calc_index_changes(existing_indexes, schema_indexes, table_renames, rename_c
   return to_run
 end
 
-def calc_fk_changes(foreign_keys, tables)
+def calc_fk_changes(foreign_keys, existing_tables, renames)
   existing_foreign_keys = []
-  unless tables.empty?
-    tables_sql = (tables.map {|tn| ActiveRecord::Base.sanitize(tn)}).join(',')
+  unless existing_tables.empty?
+    existing_tables_sql = (existing_tables.map {|tn| ActiveRecord::Base.sanitize(tn)}).join(',')
     sql = %{
       SELECT
           tc.constraint_name, tc.table_name, kcu.column_name, 
@@ -217,12 +222,16 @@ def calc_fk_changes(foreign_keys, tables)
           JOIN information_schema.constraint_column_usage AS ccu
             ON ccu.constraint_name = tc.constraint_name
       WHERE constraint_type = 'FOREIGN KEY'
-        AND tc.table_name in (#{tables_sql});
+        AND tc.table_name in (#{existing_tables_sql});
     }
     build_pg_connection.exec(sql).each do |row|
+      from_table = row['table_name']
+      from_table = renames[from_table] if renames[from_table].present?
+      to_table = row['foreign_table_name']
+      to_table = renames[to_table] if renames[to_table].present?
       existing_foreign_keys << HashWithIndifferentAccess.new({
-        :from_table => row['table_name'],
-        :to_table => row['foreign_table_name'],
+        :from_table => from_table,
+        :to_table => to_table,
         :column => row['column_name'],
         :primary_key => row['foreign_column_name'],
         :name => row['constraint_name'],
@@ -234,6 +243,26 @@ def calc_fk_changes(foreign_keys, tables)
   foreign_keys = Set.new foreign_keys
   add_fks = foreign_keys - existing_foreign_keys
   delete_fks = existing_foreign_keys - foreign_keys
+  
+  rename_fks = []
+  delete_fks.each do |delete_fk|
+    dfk = delete_fk.clone
+    dfk.delete(:name)
+    add_fks.each do |add_fk|
+      afk = add_fk.clone
+      afk.delete(:name)
+      if afk==dfk
+        delete_fks.delete delete_fk
+        add_fks.delete add_fk
+        rename_fks << {
+          :table => delete_fk[:from_table],
+          :from_name => delete_fk[:name],
+          :to_name => add_fk[:name]
+        }
+        # ALTER TABLE name RENAME CONSTRAINT "error_test_id_fkey" TO "the_new_name_fkey";
+      end
+    end
+  end
 
   to_run = []
   delete_fks.each do |fk|
@@ -242,6 +271,9 @@ def calc_fk_changes(foreign_keys, tables)
   add_fks.each do |fk|
     to_run << "ALTER TABLE #{escape_table(fk[:from_table])} ADD CONSTRAINT #{escape_table(fk[:name])} FOREIGN KEY (#{escape_table(fk[:column])}) REFERENCES #{escape_table(fk[:to_table])} (#{escape_table(fk[:primary_key])}) MATCH FULL"
   end
+  rename_fks.each do |fk|
+    to_run << "ALTER TABLE #{escape_table(fk[:table])} RENAME CONSTRAINT #{escape_table(fk[:from_name])} TO #{escape_table(fk[:to_name])}"
+  end
 
   if !to_run.empty?
     to_run.unshift("\n-- update foreign keys")
@@ -499,12 +531,11 @@ def gen_pg_adapter()
 end
 
 def sql_renames(renames)
-  to_run = []
   pg_a = gen_pg_adapter()
   renames.each do |k,v|
     pg_a.rename_table(k, v)
-    to_run += $tmp_to_run
   end
+  to_run = $tmp_to_run.clone
   if !to_run.empty?
     to_run.unshift("\n-- rename tables")
   end
@@ -539,7 +570,7 @@ def sql_adds(tables)
       $tmp_to_run << "REVOKE ALL ON #{(tables.map {|t| escape_table(t)}).join(',')} FROM #{$check_perms_for.to_a.join(',')}"
     end
   end
-  return $tmp_to_run
+  return $tmp_to_run.clone
 end
 
 def can_convert(type1, type2)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: db-evolve
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Derek Anderson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-04 00:00:00.000000000 Z
+date: 2016-03-09 00:00:00.000000000 Z
 dependencies: []
 description: A diff/patch-esque tool to replace schema migrations in Ruby.  See https://github.com/keredson/ruby-db-evolve
   for details.