dbdiff 0.1.0 → 0.2.0

data/lib/dbdiff/database.rb

@@ -2,6 +2,10 @@ require 'rubygems'
 require 'mysql'
 require 'dbdiff/delta'
 require 'dbdiff/table_element'
+require 'dbdiff/view'
+require 'dbdiff/trigger'
+require 'dbdiff/procedure'
+require 'dbdiff/function'
 require 'dbdiff/table'
 require 'dbdiff/column'
 require 'dbdiff/foreign_key'
@@ -11,7 +15,7 @@ class DbDiff
 
   # XXX validate state of information_schema?
   class Database
-    attr_reader :dbh, :tables, :name, :host, :user, :password
+    attr_reader :dbh, :tables, :procedures, :functions, :views, :name, :host, :user, :password
     attr_accessor :deltas
 
     # XXX add version check
@@ -24,6 +28,10 @@ class DbDiff
       @deltas = []
 
       initialize_tables
+      initialize_functions
+      initialize_procedures
+      initialize_triggers
+      initialize_views
       initialize_columns
       initialize_keys
       initialize_foreign_keys
@@ -34,9 +42,38 @@ class DbDiff
       @tables + @deltas.find_all{|d| d.class == Delta::AddTable }.map {|x| x.element}
     end
 
+    def initialize_triggers
+      select_is(:triggers, :trigger_schema => self.name)  do |h|
+        t = Trigger.new(h)
+        tb = table(t.table_name)
+        tb.triggers << t if tb
+      end
+    end
+
+    def initialize_functions
+      @functions = []
+      select_mysql(:proc, :type => 'FUNCTION') do |h|
+        @functions << Function.new(h)
+      end
+    end
+
+    def initialize_procedures
+      @procedures = []
+      select_mysql(:proc, :type => 'PROCEDURE') do |h|
+        @procedures << Procedure.new(h)
+      end
+    end
+
+    def initialize_views
+      @views = []
+      select_is(:views, :table_schema => self.name) do |h|
+        @views << View.new(h)
+      end
+    end
+
     def initialize_tables
       @tables = []
-      select_is(:tables, :table_schema => self.name) do |h|
+      select_is(:tables, :table_schema => self.name, :table_type => 'BASE TABLE') do |h|
         t = Table.new(h)
         t.charset = charset(t.collation)
 
@@ -58,7 +95,9 @@ class DbDiff
 
       select_is(:columns)  do |h|
         c = Column.new(h)
-        table(c.table_name).columns << c
+        t = table(c.table_name)
+        # we may not have the table since we get view columns here
+        t.columns << c if t
       end
     end
 
@@ -97,11 +136,18 @@ class DbDiff
       end
     end
 
+    def select_mysql(table, where = {}, &block)
+      @dbh.select_db('mysql')
+      # XXX
+      where[:db] = self.name 
+      self._select(table, where, &block)
+    end
+
     def select_is(table, where = {}, &block)
       @dbh.select_db('information_schema')
 
       # XXX
-      where[:table_schema] = self.name unless table == :character_sets
+      where[:table_schema] = self.name unless table == :character_sets || table == :triggers
 
       self._select(table, where, &block)
     end

data/lib/dbdiff/dbdiff_version.rb

@@ -0,0 +1,3 @@
+class DbDiff
+  Version = '0.2.0'
+end

data/lib/dbdiff/delta.rb

@@ -213,6 +213,7 @@ class DbDiff
         super
         # we don't clone foreign_keys or rows since
         # the table_elements diff will take care of them
+        @element.triggers = []
         @element.rows = []
         @element.foreign_keys = []
       end
@@ -260,6 +261,94 @@ class DbDiff
         database.tables.delete(element)
       end
     end
+
+    class AddView < Delta
+
+      def sql
+        return "CREATE VIEW `%s` AS (%s)" % [element.name,element.definition]
+      end
+
+      def process(database)
+        database.views << element
+      end
+    end
+
+    class DropView < Delta
+
+      def sql
+        return "DROP VIEW `%s`" % element.name
+      end
+
+      def process(database)
+        database.views.delete(element)
+      end
+
+    end
+
+    class AddFunction < Delta
+
+      def sql
+        return "CREATE FUNCTION `#{element.name}` (#{element.param_list}) RETURNS #{element.returns} #{element.definition}" 
+      end
+
+      def process(database)
+        database.functions << element
+      end
+    end
+
+    class AddProcedure < Delta
+
+      def sql
+        return "CREATE PROCEDURE `#{element.name}` (#{element.param_list}) #{element.definition}" 
+      end
+
+      def process(database)
+        database.procedures << element
+      end
+    end
+
+    class DropFunction < Delta
+      def sql
+        return "DROP FUNCTION `%s`" %  element.name
+      end
+
+      def process(database)
+        database.functions.delete(element)
+      end
+    end
+
+    class DropProcedure < Delta
+      def sql
+        return "DROP PROCEDURE `%s`" %  element.name
+      end
+
+      def process(database)
+        database.procedures.delete(element)
+      end
+    end
+
+    class AddTrigger < Delta
+
+      def sql
+        return "CREATE TRIGGER `#{element.name}` #{element.timing} #{element.event} ON #{element.table_name} FOR EACH ROW #{element.definition}"
+      end
+
+      def process(database)
+        table(database).triggers << element
+      end
+    end
+
+    class DropTrigger < Delta
+
+      def sql
+        return "DROP TRIGGER `#{element.name}`"
+      end
+
+      def process(database)
+        table(database).triggers.delete(element)
+      end
+
+    end
   end
 end
 

data/lib/dbdiff/function.rb

@@ -0,0 +1,14 @@
+require 'dbdiff/routine'
+class DbDiff
+  class Function < Routine
+    # XXX may want dtd_identifier
+
+    def drop_delta
+      Delta::DropFunction.new(self)
+    end
+
+    def add_delta
+      Delta::AddFunction.new(self)
+    end
+  end
+end

data/lib/dbdiff/procedure.rb

@@ -0,0 +1,13 @@
+require 'dbdiff/routine'
+class DbDiff
+  class Procedure < Routine
+    # XXX may want dtd_identifier
+    def drop_delta
+      Delta::DropProcedure.new(self)
+    end
+
+    def add_delta
+      Delta::AddProcedure.new(self)
+    end
+  end
+end

data/lib/dbdiff/routine.rb

@@ -0,0 +1,30 @@
+class DbDiff
+  class Routine
+    attr_reader :name, :param_list, :definition, :returns, :routine_type, :comment
+
+    def initialize(info= {})
+      @name = info['name']
+      @definition = info['body']
+      @param_list = info['param_list']
+      @routine_type = info['type']
+      @returns = info['returns']
+      @comment = info['comment']
+    end
+
+    def modify_delta(new_element)
+      [self.drop_delta, new_element.add_delta]
+    end
+
+    def ==(other)
+      self.name == other.name && 
+      self.param_list == other.param_list &&
+      self.routine_type == other.routine_type &&
+      self.returns == other.returns &&
+      self.definition == other.definition
+    end
+
+    def deep_clone
+      Marshal::load(Marshal.dump(self))
+    end
+  end
+end

data/lib/dbdiff/row.rb

@@ -26,7 +26,15 @@ class DbDiff
     end
 
     def ==(other)
-      self.data == other.data
+      other_data = other.data.dup
+      source_data = self.data.dup
+
+      %w(created_on updated_on).each do|c|
+        other_data.delete(c)
+        source_data.delete(c)
+      end
+
+      source_data == other_data
     end
   end
 end

data/lib/dbdiff/table.rb

@@ -1,15 +1,15 @@
 class DbDiff
   class Table
     attr_reader :name 
-    attr_accessor :charset, :rows, :keys, :foreign_keys, :columns, :collation, :engine
+    attr_accessor :charset, :rows, :triggers, :keys, :foreign_keys, :columns, :collation, :engine
 
     def initialize(info = {})
-      @data = {}
 
       @rows = []
       @foreign_keys = []
       @keys = []
       @columns = []
+      @triggers = []
 
       @engine = info['ENGINE']
       @collation = info['TABLE_COLLATION']

data/lib/dbdiff/trigger.rb

@@ -0,0 +1,36 @@
+require 'dbdiff/routine'
+class DbDiff
+  class Trigger < TableElement
+    attr_reader :definition, :timing, :event
+    # XXX may want dtd_identifier
+    #
+    def initialize(info = {})
+      @name = info['TRIGGER_NAME']
+      @table_name = info['EVENT_OBJECT_TABLE']
+      @definition = info['ACTION_STATEMENT']
+      @timing  = info['ACTION_TIMING']
+      @event  = info['EVENT_MANIPULATION']
+    end
+
+    def modify_delta(new_element)
+     [self.drop_delta, new_element.add_delta]
+    end
+
+    def drop_delta
+      Delta::DropTrigger.new(self)
+    end
+
+    def add_delta
+      Delta::AddTrigger.new(self)
+    end
+
+    def ==(other)
+      self.name == other.name && 
+      self.definition == other.definition &&
+      self.table_name == other.table_name &&
+      self.timing == other.timing &&
+      self.event == other.event
+    end
+
+  end
+end

data/lib/dbdiff/view.rb

@@ -0,0 +1,33 @@
+class DbDiff
+  class View
+    attr_reader :name, :definition
+
+    def initialize(info = {})
+      @definition = info['VIEW_DEFINITION']
+      @name = info['TABLE_NAME']
+    end
+
+
+    def ==(other)
+      self.definition == other.definition
+    end
+
+    def deep_clone
+      t = Marshal::load(Marshal.dump(self))
+      # must clear rows out since they won't necessary be in the copy
+    end
+
+    def add_delta
+      Delta::AddView.new(self)
+    end
+
+    def modify_delta(new_element)
+      [self.drop_delta, new_element.add_delta]
+    end
+
+    def drop_delta
+      Delta::DropView.new(self)
+    end
+  end
+
+end

data/test/function/source.sql

@@ -0,0 +1,3 @@
+
+create function hello (s char(20)) RETURNS char(50) return concat('hello, ', s , '!');
+

data/test/function/target.sql

@@ -0,0 +1 @@
+

data/test/modify_function/source.sql

@@ -0,0 +1,3 @@
+
+create function hello (s char(20)) RETURNS char(50) return concat('hello, ', s , '!');
+

data/test/modify_function/target.sql

@@ -0,0 +1,2 @@
+create function hello (s char(20)) RETURNS char(50) return concat('hello 444, ', s , '!');
+

data/test/modify_procedure/source.sql

@@ -0,0 +1,8 @@
+CREATE TABLE authors (
+  `id` int(11) NOT NULL auto_increment,
+  `name` char(60) NOT NULL,
+  `address` char(60) NULL,
+  PRIMARY KEY  (`id`)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE PROCEDURE simpleproc (OUT param1 INT) BEGIN SELECT COUNT(*) INTO param1 FROM authors WHERE id = 2; END;

data/test/modify_procedure/target.sql

@@ -0,0 +1,9 @@
+CREATE TABLE authors (
+  `id` int(11) NOT NULL auto_increment,
+  `name` char(60) NOT NULL,
+  `address` char(60) NULL,
+  PRIMARY KEY  (`id`)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE PROCEDURE simpleproc (OUT param1 INT) BEGIN SELECT COUNT(*) INTO param1 FROM authors; END;
+

data/test/modify_trigger/source.sql

@@ -0,0 +1,9 @@
+CREATE TABLE authors (
+  `id` int(11) NOT NULL auto_increment,
+  `name` char(60) NOT NULL,
+  `address` char(60) NULL,
+  PRIMARY KEY  (`id`)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+create trigger my_auth BEFORE INSERT on authors FOR EACH ROW BEGIN SET NEW.name = 'fXXXX'; END;
+

data/test/modify_trigger/target.sql

@@ -0,0 +1,9 @@
+CREATE TABLE authors (
+  `id` int(11) NOT NULL auto_increment,
+  `name` char(60) NOT NULL,
+  `address` char(60) NULL,
+  PRIMARY KEY  (`id`)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+create trigger my_auth BEFORE INSERT on authors FOR EACH ROW BEGIN SET NEW.name = 'fOO'; END;
+

data/test/modify_view/source.sql

@@ -0,0 +1,7 @@
+CREATE TABLE authors (
+  `id` int(11) NOT NULL auto_increment,
+  `name` char(60) NOT NULL,
+  PRIMARY KEY  (`id`)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE VIEW authors_v as (SELECT * FROM authors WHERE name = 'FOO');

data/test/modify_view/target.sql

@@ -0,0 +1,7 @@
+CREATE TABLE authors (
+  `id` int(11) NOT NULL auto_increment,
+  `name` char(60) NOT NULL,
+  PRIMARY KEY  (`id`)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE VIEW authors_v as (SELECT * FROM authors);