redshift_simple_migrator 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01923b9e53ca268191c749379cc7e8ba0f3ba2db
-  data.tar.gz: 355dc3153e7148fdee4d3e5858ccaae1ab00e131
+  metadata.gz: df47cc4f31ba3e1849b1d60811a077d2d50e9c1f
+  data.tar.gz: 7f406e403126d9d1232486288e13210467c3b358
 SHA512:
-  metadata.gz: 976fa156dd49aa6214ddaa7ee32b27406a7dc5b8699c8c86da9eab78413c2342cf3705acb3317e81a0d84c6c3e6720c0b2cdee96ae089879ac6bbc2f72339bb1
-  data.tar.gz: dba4b32033ef4f92d6a0f58e1eb3ca18e87b5eb78816842350d89da2ed0dea3e20bd4cae35ad2fe349e0c201ebc67398543b4a8f9ae6834a3b324677cebc5b2d
+  metadata.gz: 4e7a213eb0545a4bee8188d8349d87a6092a529f060e03f2678e004e9b04ddd840ceb52a127fc1a8eda41eb79b200e054953b53248b1419762ff3b2c83308bbe
+  data.tar.gz: dbb157f09cf92751e68a54f7ce52e3ad65bf03207799d69d7dbc0378b7bfee3f76f37b44fc183cc2266f5eea29b90b4a45b0a4ad8f9f4e7c24210f7bee111ff1

data/lib/redshift_simple_migrator.rb

@@ -1,12 +1,18 @@
 require "redshift_simple_migrator/version"
 
 module RedshiftSimpleMigrator
-  def self.config
-    RedshiftSimpleMigrator::Configuration.instance
-  end
+  class << self
+    def config
+      RedshiftSimpleMigrator::Configuration.instance
+    end
+
+    def configure
+      yield self.config
+    end
 
-  def self.configure
-    yield self.config
+    def logger
+      config.logger
+    end
   end
 end
 

data/lib/redshift_simple_migrator/configuration.rb

@@ -10,6 +10,8 @@ module RedshiftSimpleMigrator
       "schema_migrations"
     end
 
+    config_accessor :logger
+
     config_accessor :migrations_path
 
     config_accessor :host, :port, :dbname, :user, :password, :connect_timeout

data/lib/redshift_simple_migrator/connection.rb

@@ -13,7 +13,7 @@ module RedshiftSimpleMigrator
       :exec_params,
       :escape,
       :escape_string,
-      :escape_identifier,
+      :quote_ident,
       :escape_literal,
       to: :connection
 

data/lib/redshift_simple_migrator/migration.rb

@@ -1,12 +1,54 @@
+require 'active_support/concern'
+require 'active_support/callbacks'
+require 'active_support/core_ext/object'
+
 module RedshiftSimpleMigrator
   class Migration
+    include ActiveSupport::Callbacks
+    define_callbacks :up, :down, :execute
+
+    set_callback :up, :before, :display_migration_up_start
+    set_callback :up, :after, :display_migration_up_finish
+    set_callback :down, :before, :display_migration_down_start
+    set_callback :down, :after, :display_migration_down_finish
+
+    module RunCallbacksWrapper
+      def up
+        run_callbacks :up do
+          super
+        end
+      end
+
+      def down
+        run_callbacks :down do
+          super
+        end
+      end
+
+      def exec(*args)
+        log_sql(args[0])
+        super
+      end
+
+      def execute(*args)
+        log_sql(args[0])
+        super
+      end
+    end
+
+    def self.inherited(subclass)
+      subclass.class_eval do
+        prepend RunCallbacksWrapper
+      end
+    end
+
     attr_reader :connection, :version
 
     delegate \
       :exec,
       :escape,
       :escape_string,
-      :escape_identifier,
+      :quote_ident,
       :escape_literal,
       to: :connection
     alias :execute :exec
@@ -23,5 +65,26 @@ module RedshiftSimpleMigrator
     def down
       raise NotImplementedError
     end
+
+    def display_migration_up_start
+      puts "== #{self.class.to_s} up migrating =="
+    end
+
+    def display_migration_up_finish
+      puts "== #{self.class.to_s} up migrated =="
+    end
+
+    def display_migration_down_start
+      puts "== #{self.class.to_s} down migrating =="
+    end
+
+    def display_migration_down_finish
+      puts "== #{self.class.to_s} down migrated =="
+    end
+
+    def log_sql(sql)
+      puts "-- Execute --\n#{sql}"
+      RedshiftSimpleMigrator.logger.try(:info, "SQL (RedshiftSimpleMigrator) #{sql}")
+    end
   end
 end

data/lib/redshift_simple_migrator/migrator.rb

@@ -13,7 +13,7 @@ module RedshiftSimpleMigrator
       @connection = Connection.new
       @migrations_path = config.migrations_path
       @schema_migrations_table_name =
-        @connection.escape_identifier(config.schema_migrations_table_name)
+        @connection.quote_ident(config.schema_migrations_table_name)
 
       @current_version_is_loaded = nil
       @current_migrations = nil
@@ -24,7 +24,7 @@ module RedshiftSimpleMigrator
 
       migrations = Dir.entries(migrations_path).map do |name|
         if match = MIGRATION_FILE_PATTERN.match(name)
-          load File.expand_path(File.join(migrations_path, name))
+          require File.expand_path(File.join(migrations_path, name))
           migration_class = match[:migration_name].camelcase.constantize
           migration_class.new(connection, match[:version].to_i)
         end

data/lib/redshift_simple_migrator/railtie.rb

@@ -3,6 +3,7 @@ module RedshiftSimpleMigrator
     initializer "redshift_simple_migrator.initialization" do
       RedshiftSimpleMigrator.configure do |c|
         c.migrations_path = Rails.root.join("redshift", "migrate").to_s
+        c.logger = Rails.logger
       end
     end
 

data/lib/redshift_simple_migrator/version.rb

@@ -1,3 +1,3 @@
 module RedshiftSimpleMigrator
-  VERSION = "0.1.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redshift_simple_migrator
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - joker1007
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-16 00:00:00.000000000 Z
+date: 2015-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg