db-evolve 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 968ab94490eb008b3eedcd6b83ad0042cc4812f5
-  data.tar.gz: 5c41d69b55474bb81f0fb7829d6fd5604d5bb193
+  metadata.gz: df4390a732399e47e5810e40f119ffc1dfaf48b2
+  data.tar.gz: 9d90300f7b49ad447022b53320b3d88b14b39bbc
 SHA512:
-  metadata.gz: 059920a90809c21cf69c76183c433649f12a8425069ff1ad428858176fe693c3e6a43e019fd8dbb168492aad499f89771bfcd22ca7e707bb5050b788ec8f81ee
-  data.tar.gz: 1f9adcf24f2c40df0f427651c5f1e05db406863b89251ce74eb4394af8bbf4d8ea08acfd7b228a5a4e35029065404b0cc64535ae1472af13cab106a3fcd69222
+  metadata.gz: c433eed0a2d0df2b78438ef62ec61b91c0d303aff4ccb26b3399f96f64311296f424990d7701753ae7dcc9c27a4cb1cb4a573dd5c26c73783261cd97efc4c5d6
+  data.tar.gz: 653cf0759eeae31361ab782e8b2660de2cdd2c18177f3d52222945a7ac7705916e18ef527463ff619a1efa067cebca4c3adc8bd683386af3424eea7d250e5e63

data/lib/tasks/db.rb

@@ -105,6 +105,8 @@ 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_perms_changes($schema_tables, noop) unless $check_perms_for.empty?
 
   to_run += sql_drops(deletes)
@@ -199,6 +201,55 @@ def calc_index_changes(existing_indexes, schema_indexes, table_renames, rename_c
   return to_run
 end
 
+def calc_fk_changes(foreign_keys, tables)
+  existing_foreign_keys = []
+  unless tables.empty?
+    tables_sql = (tables.map {|tn| ActiveRecord::Base.sanitize(tn)}).join(',')
+    sql = %{
+      SELECT
+          tc.constraint_name, tc.table_name, kcu.column_name, 
+          ccu.table_name AS foreign_table_name,
+          ccu.column_name AS foreign_column_name 
+      FROM 
+          information_schema.table_constraints AS tc 
+          JOIN information_schema.key_column_usage AS kcu
+            ON tc.constraint_name = kcu.constraint_name
+          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});
+    }
+    build_pg_connection.exec(sql).each do |row|
+      existing_foreign_keys << HashWithIndifferentAccess.new({
+        :from_table => row['table_name'],
+        :to_table => row['foreign_table_name'],
+        :column => row['column_name'],
+        :primary_key => row['foreign_column_name'],
+        :name => row['constraint_name'],
+      })
+    end
+  end
+
+  existing_foreign_keys = Set.new existing_foreign_keys
+  foreign_keys = Set.new foreign_keys
+  add_fks = foreign_keys - existing_foreign_keys
+  delete_fks = existing_foreign_keys - foreign_keys
+
+  to_run = []
+  delete_fks.each do |fk|
+    to_run << "ALTER TABLE #{escape_table(fk[:from_table])} DROP CONSTRAINT IF EXISTS #{escape_table(fk[:name])}"
+  end
+  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
+
+  if !to_run.empty?
+    to_run.unshift("\n-- update foreign keys")
+  end
+
+  return to_run
+end
+
 def calc_perms_changes schema_tables, noop
   users = ($check_perms_for.map { |user| ActiveRecord::Base::sanitize(user) }).join ","
   database = ActiveRecord::Base.connection_config[:database]
@@ -209,9 +260,8 @@ def calc_perms_changes schema_tables, noop
       and grantee in (#{users})
       and table_schema='public';
   }
-  results = build_pg_connection.exec(sql)
   existing_perms = Hash.new { |h, k| h[k] = Hash.new { |h, k| h[k] = Set.new } }
-  results.each do |row|
+  build_pg_connection.exec(sql).each do |row|
     existing_perms[row['grantee']][row['table_name']].add(row['privilege_type'])
   end
   to_run = []
@@ -294,6 +344,14 @@ class Table
           c.akas = [aka]
         end
       end
+      fk = c.opts.delete(:fk)
+      if fk.present?
+        if fk.respond_to?('each')
+          add_foreign_key self.name, fk[0], column: c.name, primary_key: fk[1]
+        else
+          add_foreign_key self.name, fk, column: c.name
+        end
+      end
     else
       c.opts = {}
     end
@@ -355,6 +413,21 @@ def add_index(table, columns, opts)
   $schema_indexes.append(opts)
 end
 
+$foreign_keys = []
+
+def add_foreign_key(from_table, to_table, opts={})
+  opts = HashWithIndifferentAccess.new opts
+  opts[:from_table] = from_table.to_s
+  opts[:to_table] = to_table.to_s
+  opts[:column] = to_table.to_s.singularize + "_id" unless opts[:column].present?
+  opts[:primary_key] = "id" unless opts[:primary_key].present?
+  opts[:name] = "fk #{from_table.to_s.parameterize}.#{opts[:column].to_s.parameterize} to #{to_table.to_s.parameterize}.#{opts[:primary_key].to_s.parameterize}" unless opts[:name].present?
+  opts[:column] = opts[:column].to_s
+  opts[:primary_key] = opts[:primary_key].to_s
+  opts[:name] = opts[:name].to_s
+  $foreign_keys.append(opts)
+end
+
 $allowed_perms = Set.new ["INSERT", "SELECT", "UPDATE", "DELETE", "TRUNCATE", "REFERENCES", "TRIGGER"]
 $default_perms_for = Hash.new { |h, k| h[k] = Set.new }
 
@@ -414,6 +487,7 @@ def calc_table_changes(existing_tables, schema_tables, akas_tables)
 end
 
 def escape_table(k)
+  k = k.to_s if k.is_a? Symbol
   return PG::Connection.quote_ident k
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: db-evolve
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Derek Anderson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-03 00:00:00.000000000 Z
+date: 2016-03-04 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.