miguel 0.1.0.pre5 → 0.1.0.pre6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0ecd54548a6934b77b3f075d8b1fc74db7c555b
-  data.tar.gz: 87c76a4d8e883f01be334d3d07fd3be0598d5097
+  metadata.gz: 46b9b8bd87e9bbcb4d68e8a4b0687709dd477b4a
+  data.tar.gz: d5386b82cf60542e68e3bacfce52407d4242dd25
 SHA512:
-  metadata.gz: 1d8c0640ab68fe0d19b45a4f6ab05b34acba429d21dd3de9d30341eb64aab8127e2535ce416eb29ecdfb741d8d1f07fe624ba249ba45fce35a1d1689faaf0ad5
-  data.tar.gz: e3598249193c4e2edd85800f9b48c584526ab56045516c3910969a82ccf8ae11e79ca7dc27675e734727907303bcdf09bf43b4fe95368cbb3c43db1f4c208dc9
+  metadata.gz: 9aae54cd7492a54b558931ccecb008d07559db82d3864b690bd27dde855864eaac4e3d72d9dfaff22a5d7de0f2fc732a65a63e5eed7b291e0e2a68296fa2e7b3
+  data.tar.gz: 59015a5b44a5f50c107ddda26d7f5369f08b732c8f0c8baaa64406c5dd6d9feb834655d3fde72a72d1d9098813460c6d2e3956cd92d4e67b6d2dd105c324fb78

data/.travis.gemfile

@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 
 gem 'rake'
 gem 'bacon', '~> 1.2'
-gem 'sequel', '~> 4.0'
+gem 'sequel', '~> 4.27'
 
 platforms :ruby do
   gem 'sqlite3'

data/README.md

@@ -117,6 +117,7 @@ set_defaults :True, :TrueClass, default: true
 set_defaults :False, :TrueClass, default: false
 set_defaults :Signed, :integer, unsigned: false
 set_defaults :Unsigned, :integer, unsigned: true
+set_defaults :String, text: false
 set_defaults :Text, :String, text: true
 set_defaults :Time, :timestamp, default: '2000-01-01 00:00:00'
 set_defaults :Time?, :timestamp, default: nil
@@ -165,7 +166,7 @@ or by the common database `.yml` config file:
 ``` yaml
 # Example db.yml.
 adapter: mysql2
-user: jim
+user: dev
 password: sup3rsecr3t
 host: localhost
 database: main
@@ -192,7 +193,10 @@ leaving dozens of piecewise migration files finally behind.
 ## Limitations
 
 The database specific type support is geared towards [MySQL][] and [SQLite][].
-Generic types should work with any database, but your mileage may vary.
+[Postgres][] is supported as well,
+but note that it lacks support for some common types (e.g., unsigned integers)
+compared to other databases.
+Generic types should however work with any database, even though your mileage may vary.
 
 Changing primary keys can be as problematic as with normal Sequel migrations,
 so it's best to set them once and stick with them.
@@ -211,3 +215,4 @@ Miguel is released under the MIT license.
 [Sequel]: http://sequel.jeremyevans.net/
 [MySQL]: https://www.mysql.com/
 [SQLite]: https://www.sqlite.org/
+[Postgres]: http://www.postgresql.org/

data/lib/miguel/command.rb

@@ -136,8 +136,8 @@ module Miguel
 
     # Make sure the argument count is as expected.
     def check_args( args, count )
-      fail "Not enough arguments present', use -h to see usage." if args.count < count
-      fail "Extra arguments present', use -h to see usage." if args.count > count
+      fail "Not enough arguments present, use -h to see usage." if args.count < count
+      fail "Extra arguments present, use -h to see usage." if args.count > count
     end
 
     # Import schema from given database.

data/lib/miguel/importer.rb

@@ -61,6 +61,19 @@ module Miguel
         when /\Ainteger UNSIGNED\z/
           return :integer, :unsigned => true
         end
+      when :postgres
+        case type
+        when /\Acharacter varying/
+          return :String, :default_size => 255
+        when /\Acharacter/
+          return :String, :fixed => true, :default_size => 255
+        when /\Atext\z/
+          return :String, :text => true
+        when /\Abytea\z/
+          return :blob
+        when /\Atimestamp/
+          return :timestamp
+        end
       end
 
       case type
@@ -134,6 +147,7 @@ module Miguel
         opts = opts.dup
         columns = opts.delete( :columns )
         next if ( ! opts[ :unique ] ) && foreign_key_indexes.include?( columns ) && name == columns.first
+        opts.delete( :deferrable ) unless opts[ :deferrable ]
         table.add_index( columns, opts )
       end
     end
@@ -145,13 +159,14 @@ module Miguel
         name = opts.delete( :name )
         columns = opts.delete( :columns )
         table_name = opts.delete( :table )
+        opts.delete( :deferrable ) unless opts[ :deferrable ]
         table.add_foreign_key( columns, table_name, opts )
       end
     end
 
     # Options which are ignored for columns.
     # These are usually just schema hints which the user normally doesn't specify.
-    IGNORED_OPTS = [ :max_length ]
+    IGNORED_OPTS = [ :max_length, :oid ]
 
     # Import column type and options.
     def import_column_type_and_options( opts )
@@ -210,6 +225,7 @@ module Miguel
 
         if primary_key && ! multi_primary_key
           if auto_increment
+            opts.delete( :default ) if opts[ :default ].to_s =~ /\Anextval/
             table.add_column( :primary_key, name, opts.merge( :type => type ) )
             next
           end

data/lib/miguel/schema.rb

@@ -157,7 +157,7 @@ module Miguel
 
       # Default options implied for certain types.
       DEFAULT_OPTS = {
-        :string => { :size => 255 },
+        :string => { :size => 255, :text => false },
         :bigint => { :size => 20 },
         :decimal => { :size => [ 10, 0 ] },
         :integer => { :unsigned => false },
@@ -571,8 +571,9 @@ module Miguel
       set_defaults :False, :TrueClass, :default => false
 
       set_defaults :Signed, :integer, :unsigned => false
-      set_defaults :Unsigned, :integer, :unsigned => true
+      set_defaults :Unsigned, :integer, :unsigned => ! opts[ :signed_unsigned ]
 
+      set_defaults :String, :text => false
       set_defaults :Text, :String, :text => true
 
       # We want times to be stored as 4 byte timestamps, however
@@ -645,7 +646,9 @@ module Miguel
 
       # Define schema with provided block.
       def define( opts = {}, &block )
-        set_schema( new( opts ).define( &block ) )
+        sync do
+          set_schema( new( opts ).define( &block ) )
+        end
       end
 
       # Load schema from given file.
@@ -671,7 +674,7 @@ module Miguel
 
       # Store given schema for later if requested.
       def set_schema( schema )
-        sync{ @schema = schema if @schema == self }
+        @schema = schema if @schema == self
         schema
       end
 

data/miguel.gemspec

@@ -4,7 +4,7 @@ require File.expand_path( '../lib/miguel/version', __FILE__ )
 
 Gem::Specification.new do |s|
   s.name        = 'miguel'
-  s.version     = Miguel::VERSION + '.pre5'
+  s.version     = Miguel::VERSION + '.pre6'
   s.summary     = 'Database migrator and migration generator for Sequel.'
   s.description = <<EOT
 This gem makes it easy to create and maintain an up-to-date database schema
@@ -20,7 +20,7 @@ EOT
   s.executables = `git ls-files -- bin/*`.split( "\n" ).map{ |f| File.basename( f ) }
 
   s.required_ruby_version = '>= 1.9.3'
-  s.add_runtime_dependency 'sequel', '~> 4.0'
+  s.add_runtime_dependency 'sequel', '~> 4.27'
   s.add_development_dependency 'bacon', '~> 1.2'
   s.add_development_dependency 'sqlite3'
   s.add_development_dependency 'mysql2'

data/test/data/db.yml

@@ -12,6 +12,10 @@ mysql:
   encoding: utf8
 
 postgres:
-  adapter: sqlite
+  adapter: postgres
+  user: postgres
+  host: localhost
+  database: miguel_test
+  encoding: utf8
 
 # EOF #

data/test/data/schema.rb

@@ -2,9 +2,11 @@
 
 Miguel::Schema.define( use_defaults: false ) do
 
+  mysql = opts[ :mysql_timestamps ]
+
   table :sequel_types do
     Integer :a0                         # integer
-    String :a1                          # varchar(255)
+    String :a1, :text=>false            # varchar(255)
     String :a2, :size=>50               # varchar(50)
     String :a3, :fixed=>true            # char(255)
     String :a4, :fixed=>true, :size=>50 # char(50)
@@ -47,8 +49,13 @@ Miguel::Schema.define( use_defaults: false ) do
   table :native_types do
     date :date, default: '2000-12-31'
     time :time, default: '23:59:59'
-    datetime :datetime, default: '2037-12-31 23:59:59'
     timestamp :timestamp, default: '1970-01-02 00:00:00'
+    if mysql
+      datetime :datetime, default: '2037-12-31 23:59:59'
+      enum :enum, elements: %w[ none invalid expired declined other ], default: 'none'
+      set :set, elements: %w[ read write create delete ], default: 'read'
+      set :tricky, elements: [ "\n", "\t", "\\", "r'n'r" ]
+    end
   end
 
   table :timestamps do

data/test/data/schema.txt

@@ -1,6 +1,6 @@
 table :sequel_types do
   Integer :a0
-  String :a1
+  String :a1, :text => false
   String :a2, :size => 50
   String :a3, :fixed => true
   String :a4, :fixed => true, :size => 50
@@ -20,7 +20,7 @@ table :sequel_types do
 end
 table :miguel_types do
   integer :key, :null => false, :unsigned => false
-  String :string, :null => false
+  String :string, :null => false, :text => false
   String :text, :null => false, :text => true
   File :blob, :null => false
   Integer :int, :null => false
@@ -36,7 +36,6 @@ end
 table :native_types do
   date :date, :null => false, :default => "2000-12-31"
   time :time, :null => false, :default => "23:59:59"
-  datetime :datetime, :null => false, :default => "2037-12-31 23:59:59"
   timestamp :timestamp, :null => false, :default => "1970-01-02 00:00:00"
 end
 table :timestamps do
@@ -47,7 +46,7 @@ table :timestamps do
 end
 table :users do
   primary_key :id, :null => false, :unsigned => false
-  String :name, :null => false
+  String :name, :null => false, :text => false
   index [:name], :null => false, :unique => true
 end
 table :simple do
@@ -64,7 +63,7 @@ table :compound do
   Integer :a, :null => false
   Integer :b, :null => false
   primary_key [:a, :b], :null => false, :unsigned => false
-  String :c, :null => false
+  String :c, :null => false, :text => false
   integer :d, :null => false, :unsigned => false
   index [:a, :c], :null => false, :unique => true
   index [:b, :c, :d], :null => false
@@ -72,7 +71,7 @@ table :compound do
   foreign_key [:b, :a], :compound, :null => false, :key => [:a, :b], :unsigned => false
 end
 table :null do
-  String :string, :null => true
+  String :string, :null => true, :text => false
   String :text, :null => true, :text => true
   File :blob, :null => true
   Integer :int, :null => true
@@ -87,7 +86,7 @@ table :null do
   foreign_key [:user_id], :users, :null => true, :key => [:id], :unsigned => false
 end
 table :defaults do
-  String :string, :null => false, :default => "abc"
+  String :string, :null => false, :text => false, :default => "abc"
   Integer :int, :null => false, :default => 10
   integer :signed, :null => false, :unsigned => false, :default => -1
   integer :unsigned, :null => false, :unsigned => true, :default => 1000

data/test/data/schema_bare.txt

@@ -1,6 +1,6 @@
 create_table :sequel_types do
   Integer :a0
-  String :a1
+  String :a1, :text => false
   String :a2, :size => 50
   String :a3, :fixed => true
   String :a4, :fixed => true, :size => 50
@@ -20,7 +20,7 @@ create_table :sequel_types do
 end
 create_table :miguel_types do
   integer :key, :null => false, :unsigned => false
-  String :string, :null => false
+  String :string, :null => false, :text => false
   String :text, :null => false, :text => true
   File :blob, :null => false
   Integer :int, :null => false
@@ -36,7 +36,6 @@ end
 create_table :native_types do
   date :date, :null => false, :default => "2000-12-31"
   time :time, :null => false, :default => "23:59:59"
-  datetime :datetime, :null => false, :default => "2037-12-31 23:59:59"
   timestamp :timestamp, :null => false, :default => "1970-01-02 00:00:00"
 end
 create_table :timestamps do
@@ -47,7 +46,7 @@ create_table :timestamps do
 end
 create_table :users do
   primary_key :id, :null => false, :unsigned => false
-  String :name, :null => false
+  String :name, :null => false, :text => false
   index [:name], :null => false, :unique => true
 end
 create_table :simple do
@@ -62,14 +61,14 @@ create_table :compound do
   Integer :a, :null => false
   Integer :b, :null => false
   primary_key [:a, :b], :null => false, :unsigned => false
-  String :c, :null => false
+  String :c, :null => false, :text => false
   integer :d, :null => false, :unsigned => false
   index [:a, :c], :null => false, :unique => true
   index [:b, :c, :d], :null => false
   index [:b, :a], :null => false
 end
 create_table :null do
-  String :string, :null => true
+  String :string, :null => true, :text => false
   String :text, :null => true, :text => true
   File :blob, :null => true
   Integer :int, :null => true
@@ -83,7 +82,7 @@ create_table :null do
   integer :user_id, :null => true, :key => [:id], :unsigned => false
 end
 create_table :defaults do
-  String :string, :null => false, :default => "abc"
+  String :string, :null => false, :text => false, :default => "abc"
   Integer :int, :null => false, :default => 10
   integer :signed, :null => false, :unsigned => false, :default => -1
   integer :unsigned, :null => false, :unsigned => true, :default => 1000

data/test/data/schema_change.txt

@@ -2,7 +2,7 @@ Sequel.migration do
   change do
     create_table :sequel_types do
       Integer :a0
-      String :a1
+      String :a1, :text => false
       String :a2, :size => 50
       String :a3, :fixed => true
       String :a4, :fixed => true, :size => 50
@@ -22,7 +22,7 @@ Sequel.migration do
     end
     create_table :miguel_types do
       integer :key, :null => false, :unsigned => false
-      String :string, :null => false
+      String :string, :null => false, :text => false
       String :text, :null => false, :text => true
       File :blob, :null => false
       Integer :int, :null => false
@@ -38,7 +38,6 @@ Sequel.migration do
     create_table :native_types do
       date :date, :null => false, :default => "2000-12-31"
       time :time, :null => false, :default => "23:59:59"
-      datetime :datetime, :null => false, :default => "2037-12-31 23:59:59"
       timestamp :timestamp, :null => false, :default => "1970-01-02 00:00:00"
     end
     create_table :timestamps do
@@ -49,7 +48,7 @@ Sequel.migration do
     end
     create_table :users do
       primary_key :id, :null => false, :unsigned => false
-      String :name, :null => false
+      String :name, :null => false, :text => false
       index [:name], :null => false, :unique => true
     end
     create_table :simple do
@@ -64,14 +63,14 @@ Sequel.migration do
       Integer :a, :null => false
       Integer :b, :null => false
       primary_key [:a, :b], :null => false, :unsigned => false
-      String :c, :null => false
+      String :c, :null => false, :text => false
       integer :d, :null => false, :unsigned => false
       index [:a, :c], :null => false, :unique => true
       index [:b, :c, :d], :null => false
       index [:b, :a], :null => false
     end
     create_table :null do
-      String :string, :null => true
+      String :string, :null => true, :text => false
       String :text, :null => true, :text => true
       File :blob, :null => true
       Integer :int, :null => true
@@ -85,7 +84,7 @@ Sequel.migration do
       integer :user_id, :null => true, :key => [:id], :unsigned => false
     end
     create_table :defaults do
-      String :string, :null => false, :default => "abc"
+      String :string, :null => false, :text => false, :default => "abc"
       Integer :int, :null => false, :default => 10
       integer :signed, :null => false, :unsigned => false, :default => -1
       integer :unsigned, :null => false, :unsigned => true, :default => 1000

data/test/data/schema_full.txt

@@ -2,7 +2,7 @@ Sequel.migration do
   up do
     create_table :sequel_types do
       Integer :a0
-      String :a1
+      String :a1, :text => false
       String :a2, :size => 50
       String :a3, :fixed => true
       String :a4, :fixed => true, :size => 50
@@ -22,7 +22,7 @@ Sequel.migration do
     end
     create_table :miguel_types do
       integer :key, :null => false, :unsigned => false
-      String :string, :null => false
+      String :string, :null => false, :text => false
       String :text, :null => false, :text => true
       File :blob, :null => false
       Integer :int, :null => false
@@ -38,7 +38,6 @@ Sequel.migration do
     create_table :native_types do
       date :date, :null => false, :default => "2000-12-31"
       time :time, :null => false, :default => "23:59:59"
-      datetime :datetime, :null => false, :default => "2037-12-31 23:59:59"
       timestamp :timestamp, :null => false, :default => "1970-01-02 00:00:00"
     end
     create_table :timestamps do
@@ -49,7 +48,7 @@ Sequel.migration do
     end
     create_table :users do
       primary_key :id, :null => false, :unsigned => false
-      String :name, :null => false
+      String :name, :null => false, :text => false
       index [:name], :null => false, :unique => true
     end
     create_table :simple do
@@ -64,14 +63,14 @@ Sequel.migration do
       Integer :a, :null => false
       Integer :b, :null => false
       primary_key [:a, :b], :null => false, :unsigned => false
-      String :c, :null => false
+      String :c, :null => false, :text => false
       integer :d, :null => false, :unsigned => false
       index [:a, :c], :null => false, :unique => true
       index [:b, :c, :d], :null => false
       index [:b, :a], :null => false
     end
     create_table :null do
-      String :string, :null => true
+      String :string, :null => true, :text => false
       String :text, :null => true, :text => true
       File :blob, :null => true
       Integer :int, :null => true
@@ -85,7 +84,7 @@ Sequel.migration do
       integer :user_id, :null => true, :key => [:id], :unsigned => false
     end
     create_table :defaults do
-      String :string, :null => false, :default => "abc"
+      String :string, :null => false, :text => false, :default => "abc"
       Integer :int, :null => false, :default => 10
       integer :signed, :null => false, :unsigned => false, :default => -1
       integer :unsigned, :null => false, :unsigned => true, :default => 1000

data/test/data/seq_0.txt

@@ -5,7 +5,7 @@ Sequel.migration do
     end
     create_table :b do
       primary_key :id, :null => false, :unsigned => false
-      String :t, :null => false
+      String :t, :null => false, :text => false
       integer :u, :null => true, :unsigned => true
       integer :s, :null => false, :unsigned => false
     end

data/test/data/seq_1.txt

@@ -18,7 +18,7 @@ Sequel.migration do
     end
     create_table :c do
       primary_key :id, :null => false, :unsigned => false
-      String :s, :null => true
+      String :s, :null => true, :text => false
     end
     create_table :d do
       Integer :a, :null => false
@@ -50,7 +50,7 @@ Sequel.migration do
       drop_column :create_time # :timestamp, :null => false, :default => "2000-01-01 00:00:00"
       drop_column :update_time # :timestamp, :null => false, :default => "2000-01-01 00:00:00"
       drop_column :fk # :integer, :null => false, :key => [:id], :unsigned => false
-      set_column_type :t, String, :null => false
+      set_column_type :t, String, :null => false, :text => false
       set_column_allow_null :u
       set_column_default :u, nil
       set_column_default :s, 0

data/test/data/simple.txt

@@ -1,6 +1,6 @@
 table :items do
   primary_key :id, :null => false, :unsigned => false
-  String :name, :null => false
+  String :name, :null => false, :text => false
   integer :parent_id, :null => false, :key => [:id], :unsigned => false
   timestamp :create_time, :null => false, :default => "2000-01-01 00:00:00"
   timestamp :update_time, :null => false, :default => "2000-01-01 00:00:00"

data/test/data/simple_mysql.txt

@@ -1,6 +1,6 @@
 table :items do
   primary_key :id, :null => false, :unsigned => true, :type => :integer
-  String :name, :null => false
+  String :name, :null => false, :text => false
   integer :parent_id, :null => false, :key => [:id], :unsigned => true, :type => :integer
   timestamp :create_time, :null => false, :default => "0000-00-00 00:00:00"
   timestamp :update_time, :null => false, :default => Sequel.lit("CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")

data/test/test_command.rb

@@ -0,0 +1,215 @@
+# Test Command.
+
+require_relative 'helper'
+require 'miguel/command'
+
+require 'open3'
+require 'tempfile'
+
+describe Miguel::Command do
+
+  EXCEPTION_SCHEMA = <<-EOT
+    Miguel::Schema.define do
+      raise NotImplementedError
+    end
+  EOT
+
+  def match_file( data, name )
+    match( data, File.read( data( name ) ) )
+  end
+
+  def with_tempfile( content = nil, extension = 'rb' )
+    f = Tempfile.new( [ 'miguel', ".#{extension}" ] )
+    if content
+      f.write( content )
+      f.flush
+      f.rewind
+    end
+    yield f.path
+  ensure
+    f.close
+    f.unlink
+  end
+
+  def run( *args )
+    out = err = nil
+    Open3.popen3( 'ruby', 'bin/miguel', *args ) do |i, o, e, t|
+      yield i if block_given?
+      i.close
+      out = o.read
+      err = e.read
+    end
+    [ out, err ]
+  end
+
+  def test( *args )
+    out, err = run( *args )
+    err.should.be.empty
+    out
+  end
+
+  should 'provide help' do
+    test( '--help' ).should.match /Show this message/
+  end
+
+  should 'show version' do
+    test( '--version' ).should.match /\Amiguel #{Miguel::VERSION}\Z/
+  end
+
+  should 'show schema' do
+    out = test( 'show', data( 'schema.rb' ) )
+    match_file( out, 'schema.txt' )
+  end
+
+  should 'show schema changes' do
+    out = test( 'dump', data( 'schema.rb' ) )
+    match_file( out, 'schema_bare.txt' )
+  end
+
+  should 'show schema changes in various formats' do
+    for format in %w[ bare change full ]
+      out = test( 'dump', '--migration', format, data( 'schema.rb' ) )
+      match_file( out, "schema_#{format}.txt" )
+    end
+  end
+
+  should 'show changes needed to remove schema' do
+    out = test( 'down', data( 'schema.rb' ) )
+    match_file( out, 'schema_down.txt' )
+  end
+
+  should 'show changes needed to migrate from one schema to another' do
+    schema = 'sqlite://'
+    SEQ_COUNT.times do |i|
+      new_schema = data( "seq_#{i}.rb" )
+      out = test( 'diff', '-m', 'full', schema, new_schema )
+      match_file( out, "seq_#{i}.txt" )
+      schema = new_schema
+    end
+  end
+
+  should 'apply schema to the database' do
+    test( 'apply', '--env', 'mysql', data( 'db.yml' ), data( 'schema.rb' ), '--force' ).should.not.be.empty
+    test( 'apply', '--env', 'mysql', data( 'db.yml' ), data( 'schema.rb' ), '--force' ).should.match /\ANo changes are necessary\.\Z/
+  end
+
+  should 'be able to clear the entire database' do
+    test( 'apply', '--env', 'mysql', data( 'db.yml' ), data( 'schema.rb' ), '--force' )
+    test( 'clear', '--env', 'mysql', data( 'db.yml' ), '--force' ).should.not.be.empty
+    test( 'clear', '--env', 'mysql', data( 'db.yml' ), '--force' ).should.match /\ANo changes are necessary\.\Z/
+  end
+
+  should 'require confirmation before changing the database' do
+    out, err = run( 'apply', '--env', 'mysql', data( 'db.yml' ), data( 'schema.rb' ) )
+    out.should.match /^Confirm \(yes or no\)\?/
+    err.should.match /\AOK, aborting\.\Z/
+
+    out, err = run( 'apply', '--env', 'mysql', data( 'db.yml' ), data( 'schema.rb' ) ) do |input|
+      input.write 'blah'
+    end
+    out.should.match /^Confirm \(yes or no\)\?/
+    out.should.match /Please answer 'yes' or 'no'\.$/
+    err.should.match /\AOK, aborting\.\Z/
+
+    out, err = run( 'apply', '--env', 'mysql', data( 'db.yml' ), data( 'schema.rb' ) ) do |input|
+      input.write 'no'
+    end
+    out.should.match /^Confirm \(yes or no\)\?/
+    out.should.not.match /Please answer 'yes' or 'no'\.$/
+    err.should.match /\AOK, aborting\.\Z/
+
+    out, err = run( 'apply', '--env', 'mysql', data( 'db.yml' ), data( 'schema.rb' ) ) do |input|
+      input.write 'yes'
+    end
+    out.should.match /^Confirm \(yes or no\)\?/
+    out.should.match /OK, those changes were applied\./
+    err.should.be.empty
+
+    out, err = run( 'clear', '--env', 'mysql', data( 'db.yml' ) )
+    out.should.match /^Confirm \(yes or no\)\?/
+    err.should.match /\AOK, aborting\.\Z/
+
+    out, err = run( 'clear', '--env', 'mysql', data( 'db.yml' ) ) do |input|
+      input.write 'yes'
+    end
+    out.should.match /^Confirm \(yes or no\)\?/
+    out.should.match /OK, those changes were applied\./
+    err.should.be.empty
+  end
+
+  should 'show no changes when told so' do
+    test( 'apply', '--env', 'mysql', data( 'db.yml' ), data( 'schema.rb' ), '--force', '--quiet' ).should.be.empty
+    test( 'apply', '--env', 'mysql', data( 'db.yml' ), data( 'schema.rb' ), '--force', '--quiet' ).should.be.empty
+    test( 'clear', '--env', 'mysql', data( 'db.yml' ), '--force', '--quiet' ).should.be.empty
+    test( 'clear', '--env', 'mysql', data( 'db.yml' ), '--force', '--quiet' ).should.be.empty
+  end
+
+  should 'log SQL commands to stdout when requested' do
+    test( 'show', '--env', 'mysql', data( 'db.yml' ), '--echo' ).should.match /SHOW FULL TABLES/
+  end
+
+  should 'log SQL commands to given file when requested' do
+    with_tempfile do |path|
+      test( 'show', '--env', 'mysql', data( 'db.yml' ), '--log', path )
+      File.read( path ).should.match /SHOW FULL TABLES/
+    end
+  end
+
+  should 'report errors in loaded schema' do
+    with_tempfile( EXCEPTION_SCHEMA ) do |path|
+      out, err = run( 'show', path )
+      out.should.be.empty
+      err.should.match /NotImplementedError: NotImplementedError/
+      err.should.not.match /bin\/miguel/
+    end
+  end
+
+  should 'show full trace when requested' do
+    with_tempfile( EXCEPTION_SCHEMA ) do |path|
+      out, err = run( 'show', path, '--trace' )
+      out.should.be.empty
+      err.should.match /bin\/miguel/
+    end
+  end
+
+  should 'report invalid command' do
+    out, err = run( 'blah' )
+    out.should.be.empty
+    err.should.match /\AInvalid command, use -h to see usage\.\Z/
+  end
+
+  should 'report invalid number of arguments' do
+    out, err = run( 'show' )
+    out.should.be.empty
+    err.should.match /\ANot enough arguments present, use -h to see usage\.\Z/
+
+    out, err = run( 'show', 'arg1', 'arg2' )
+    out.should.be.empty
+    err.should.match /\AExtra arguments present, use -h to see usage\.\Z/
+  end
+
+  should 'report invalid arguments' do
+    out, err = run( 'show', '' )
+    out.should.be.empty
+    err.should.match /\AMissing database or schema name\.\Z/
+
+    out, err = run( 'clear', '' )
+    out.should.be.empty
+    err.should.match /\AMissing database name\.\Z/
+
+    out, err = run( 'clear', data( 'nonexistent.rb' ) )
+    out.should.be.empty
+    err.should.match /\ADatabase config \S+\/nonexistent\.rb not found\.\Z/
+  end
+
+  should 'report empty schema' do
+    with_tempfile( '' ) do |path|
+      out, err = run( 'show', path )
+      out.should.be.empty
+      err.should.match /\ANo schema loaded from file '\S+\.rb'\.\Z/
+    end
+  end
+
+end
+
+# EOF #

data/test/test_schema.rb

@@ -104,7 +104,7 @@ describe Miguel::Schema do
     match_schema <<-EOT do
       table :miguel_types do
         integer :key, :null => false, :unsigned => false
-        String :string, :null => false
+        String :string, :null => false, :text => false
         String :text, :null => false, :text => true
         File :blob, :null => false
         Integer :int, :null => false
@@ -370,7 +370,7 @@ describe Miguel::Schema do
       table :index do
         Integer :a, :null => false
         Integer :b, :null => false
-        String :s, :null => false
+        String :s, :null => false, :text => false
         index [:a], :null => false
         index [:b], :null => false, :unique => true
         index [:a, :b], :null => false
@@ -392,7 +392,7 @@ describe Miguel::Schema do
   should 'support null columns' do
     match_schema <<-EOT do
       table :null do
-        String :string, :null => true
+        String :string, :null => true, :text => false
         String :text, :null => true, :text => true
         File :blob, :null => true
         Integer :int, :null => true
@@ -427,7 +427,7 @@ describe Miguel::Schema do
   should 'support default values' do
     match_schema <<-EOT do
       table :defaults do
-        String :string, :null => false, :default => "abc"
+        String :string, :null => false, :text => false, :default => "abc"
         Integer :int, :null => false, :default => 10
         integer :signed, :null => false, :unsigned => false, :default => -1
         integer :unsigned, :null => false, :unsigned => true, :default => 1000
@@ -496,7 +496,7 @@ describe Miguel::Schema do
         integer :left_id, :null => false, :key => [:id], :unsigned => false
         integer :right_id, :null => false, :key => [:id], :unsigned => false
         primary_key [:left_id, :right_id], :null => false, :unsigned => false
-        String :name, :null => false
+        String :name, :null => false, :text => false
         index [:right_id, :left_id], :null => false, :unique => true
         foreign_key [:left_id], :left, :null => false, :key => [:id], :unsigned => false
         foreign_key [:right_id], :right, :null => false, :key => [:id], :unsigned => false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miguel
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre5
+  version: 0.1.0.pre6
 platform: ruby
 authors:
 - Patrik Rak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-25 00:00:00.000000000 Z
+date: 2015-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.27'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.27'
 - !ruby/object:Gem::Dependency
   name: bacon
   requirement: !ruby/object:Gem::Requirement
@@ -123,6 +123,7 @@ files:
 - test/data/simple.txt
 - test/data/simple_mysql.txt
 - test/helper.rb
+- test/test_command.rb
 - test/test_dumper.rb
 - test/test_importer.rb
 - test/test_migrator.rb