ridgepole 0.7.1.beta → 0.7.1.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed6f5b00c9332bcd40b24033c2419b08130a5879
-  data.tar.gz: 5eba0f7b43c51fcc70413bacf8c262f5224347fe
+  metadata.gz: 130a2d52ac418b8bfd080f5696072f1e6abd00b2
+  data.tar.gz: 33ec9d8a72263cf6b7bcdcdc601e272d5dec616a
 SHA512:
-  metadata.gz: 606f4bbc6c975f8fbb8cb3ebfda3589b102e17eda2b807006a19e75ba2a9fe7bbced5e38bb53cec7764ba3cda125e84c76985aca5e2030107cca0997479513ca
-  data.tar.gz: c8316fbc6e3814f3cd5d974ab5ff1985832309b175181949d4dd37ee113de9aa12131889e1100fbe64cbba9a1bd01c6f12d86a9ce9bc92bae9b80186b4fce659
+  metadata.gz: c5a60a3d8a64cd0110049c1ac599bbf326f61c968d3884a810229c294b9263ef8a02943c121b4d2bb71b4820759bbc4a4113900580b7b773cb53b1fdb21f8815
+  data.tar.gz: 940bfaf02ac5a69c60c5081b522c6e02a7dc782826475ae64aba8977903adba4da4c1a556ba424f9cb2403c3e1d583f5269911886335fefd93a6aac808628a76

data/.travis.yml

@@ -15,9 +15,9 @@ before_script:
   - sudo service mysql stop
   - sudo service postgresql stop
   - docker-compose up -d
-  - function mysql_ping { mysqladmin -u root -h 127.0.0.1 -ppassword ping > /dev/null 2> /dev/null; }
-  - function mysql57_ping { mysqladmin -u root -h 127.0.0.1 -P 3307 -ppassword ping > /dev/null 2> /dev/null; }
-  - function pg_ping { PGPASSWORD=password pg_isready -U postgres -h 127.0.0.1 > /dev/null 2> /dev/null; }
+  - function mysql_ping { mysqladmin -u root -h 127.0.0.1 -P 13316 -ppassword ping; }
+  - function mysql57_ping { mysqladmin -u root -h 127.0.0.1 -P 13317  -ppassword ping; }
+  - function pg_ping { PGPASSWORD=password pg_isready -U postgres -h 127.0.0.1 -p 15442; }
   - for i in {1..60}; do mysql_ping && break; sleep 1; done
   - for i in {1..60}; do mysql57_ping && break; sleep 1; done
   - for i in {1..60}; do pg_ping && break; sleep 1; done

data/lib/ridgepole/cli/config.rb

@@ -37,7 +37,7 @@ class Ridgepole::Config
     def parse_database_url(config)
       uri = URI.parse(config)
 
-      if [uri.scheme, uri.user, uri.host, uri.path].any? {|i| i.nil? }
+      if [uri.scheme, uri.user, uri.host, uri.path].any? {|i| i.nil? or i.empty? }
         raise "Invalid config: #{config.inspect}"
       end
 

data/lib/ridgepole/dumper.rb

@@ -1,6 +1,7 @@
 class Ridgepole::Dumper
   def initialize(options = {})
     @options = options
+    @logger = Ridgepole::Logger.instance
   end
 
   def dump
@@ -29,6 +30,13 @@ class Ridgepole::Dumper
       ActiveRecord::SchemaDumper.ignore_tables.clear
     end
 
+    stream.string.lines.each_cons(2) do |first_line, second_line|
+      if first_line =~ /\A# Could not dump/
+        @logger.warn("[WARNING] #{first_line.sub(/\A# /, '').chomp}")
+        @logger.warn(second_line.sub(/\A#/, '').chomp)
+      end
+    end
+
     dsl = stream.string.lines.select do |line|
       line !~ /\A#/ &&
       line !~ /\AActiveRecord::Schema\.define/ &&

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.7.1.beta'
+  VERSION = '0.7.1.beta2'
 end

data/spec/mysql/dump/dump_unknown_column_type_spec.rb

@@ -0,0 +1,26 @@
+describe 'Ridgepole::Client#dump' do
+  context 'when there is a tables' do
+    before { restore_tables_mysql_unknown_column_type }
+    subject { client }
+
+    it {
+      expect(subject.dump).to match_fuzzy erbh(<<-EOS)
+        create_table "clubs", <%= i cond(5.1, id: :integer) %>, unsigned: true, force: :cascade do |t|
+          t.string "name", default: "", null: false
+          t.index ["name"], name: "idx_name", unique: true, <%= i cond(5.0, using: :btree) %>
+        end
+      EOS
+    }
+
+    it {
+      expect(Ridgepole::Logger.instance).to receive(:warn).twice
+      subject.dump
+    }
+
+    it {
+      expect(Ridgepole::Logger.instance).to receive(:warn).with("[WARNING] Could not dump table \"places\" because of following StandardError")
+      expect(Ridgepole::Logger.instance).to receive(:warn).with("   Unknown type 'geometry' for column 'location'")
+      subject.dump
+    }
+  end
+end

data/spec/mysql/ridgepole_test_tables_unknown_column_type.sql

@@ -0,0 +1,17 @@
+USE `ridgepole_test`;
+
+DROP TABLE IF EXISTS `clubs`;
+CREATE TABLE `clubs` (
+  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(255) NOT NULL DEFAULT '',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `idx_name` (`name`)
+);
+
+DROP TABLE IF EXISTS `places`;
+CREATE TABLE `places` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `location` geometry NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `id` (`id`)
+);

data/spec/spec_helper.rb

@@ -95,6 +95,11 @@ module SpecHelper
     system_raise_on_fail("#{PG_PSQL} ridgepole_test -q -f #{sql_file} 2>/dev/null")
   end
 
+  def restore_tables_mysql_unknown_column_type
+    sql_file = File.expand_path('../mysql/ridgepole_test_tables_unknown_column_type.sql', __FILE__)
+    system_raise_on_fail("#{MYSQL_CLI} < #{sql_file}")
+  end
+
   def client(options = {}, config = {})
     config = conn_spec(config)
     default_options = {debug: condition(:debug)}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.7.1.beta
+  version: 0.7.1.beta2
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-21 00:00:00.000000000 Z
+date: 2017-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -258,6 +258,7 @@ files:
 - spec/mysql/dump/dump_class_method_spec.rb
 - spec/mysql/dump/dump_some_tables_spec.rb
 - spec/mysql/dump/dump_spec.rb
+- spec/mysql/dump/dump_unknown_column_type_spec.rb
 - spec/mysql/dump/dump_without_table_options_spec.rb
 - spec/mysql/fk/migrate_change_fk_spec.rb
 - spec/mysql/fk/migrate_create_fk_spec.rb
@@ -323,6 +324,7 @@ files:
 - spec/mysql/migrate_/migrate_drop_index_with_alter_spec.rb
 - spec/mysql/ridgepole_test_database.sql
 - spec/mysql/ridgepole_test_tables.sql
+- spec/mysql/ridgepole_test_tables_unknown_column_type.sql
 - spec/mysql/text_blob_types/text_blob_types_spec.rb
 - spec/mysql/~default_name_fk/migrate_change_fk_spec.rb
 - spec/mysql/~default_name_fk/migrate_create_fk_spec.rb
@@ -406,6 +408,7 @@ test_files:
 - spec/mysql/dump/dump_class_method_spec.rb
 - spec/mysql/dump/dump_some_tables_spec.rb
 - spec/mysql/dump/dump_spec.rb
+- spec/mysql/dump/dump_unknown_column_type_spec.rb
 - spec/mysql/dump/dump_without_table_options_spec.rb
 - spec/mysql/fk/migrate_change_fk_spec.rb
 - spec/mysql/fk/migrate_create_fk_spec.rb
@@ -471,6 +474,7 @@ test_files:
 - spec/mysql/migrate_/migrate_drop_index_with_alter_spec.rb
 - spec/mysql/ridgepole_test_database.sql
 - spec/mysql/ridgepole_test_tables.sql
+- spec/mysql/ridgepole_test_tables_unknown_column_type.sql
 - spec/mysql/text_blob_types/text_blob_types_spec.rb
 - spec/mysql/~default_name_fk/migrate_change_fk_spec.rb
 - spec/mysql/~default_name_fk/migrate_create_fk_spec.rb