miguel 0.1.0.pre2 → 0.1.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cc20233657ee51f12faa39ae0c81c55184b09cb
-  data.tar.gz: 983d7e268d3cd5f9448b128b56f84f5a2f64cdea
+  metadata.gz: be756726f39332cdc296e5a236f934748da5676d
+  data.tar.gz: bac00b2ce0a29b8e020f78c5bb76bf41b4185ac7
 SHA512:
-  metadata.gz: 61288b386f01bf54e2fedda5f0988e70ab0aaf3eb2133279b43ebc69f277a7cff39c57170eb92c5209fd418dd0a1613ef9ef43a87d75f2d6112ebbcfa96c8b66
-  data.tar.gz: 43f256c47f62d61d58f2031d5ec0cbcf6c8d1ce89c0e583e272c7701d9e618e8d51590010412ba4fb37bfca506c49e08f625ac15004ae6541f58f2d7d2107bfe
+  metadata.gz: d7ff9bb4c91af68d0902e63f3bf4616ffece4be5015ed3517cf5915f86632f1dd60a8d3f37b7c1271803795c79f4de9d9ab70d1ff5194002562bdd06897b6aa4
+  data.tar.gz: 2d1ca527b7bf924d5fb571c1a320d86030e9a004c4bd13c106c41fd795f571e079c1359ead9f4dd11e7e301a6ba534244a7b8a9f53a0fc680a7036e53533d258

data/.travis.gemfile

@@ -5,5 +5,6 @@ source 'https://rubygems.org'
 gem 'rake'
 gem 'bacon', '~> 1.2'
 gem 'sequel', '~> 4.0'
+gem 'sqlite3', '~> 1.3'
 
 # EOF #

data/README.md

@@ -1,6 +1,6 @@
 # Miguel
 
-[![Gem Version](https://img.shields.io/gem/v/miguel.svg)](http://rubygems.org/gems/miguel) [![Build Status](https://img.shields.io/travis/raxoft/miguel.svg?branch=master)](http://travis-ci.org/raxoft/miguel) [![Dependency Status](https://img.shields.io/gemnasium/raxoft/miguel.svg)](https://gemnasium.com/raxoft/miguel) [![Code Climate](https://img.shields.io/codeclimate/github/raxoft/miguel.svg)](https://codeclimate.com/github/raxoft/miguel) [![Coverage](https://img.shields.io/codeclimate/coverage/github/raxoft/miguel.svg)](https://codeclimate.com/github/raxoft/miguel)
+[![Gem Version](https://img.shields.io/gem/v/miguel.svg)](http://rubygems.org/gems/miguel) [![Build Status](https://travis-ci.org/raxoft/miguel.svg?branch=master)](http://travis-ci.org/raxoft/miguel) [![Dependency Status](https://img.shields.io/gemnasium/raxoft/miguel.svg)](https://gemnasium.com/raxoft/miguel) [![Code Climate](https://img.shields.io/codeclimate/github/raxoft/miguel.svg)](https://codeclimate.com/github/raxoft/miguel) [![Coverage](https://img.shields.io/codeclimate/coverage/github/raxoft/miguel.svg)](https://codeclimate.com/github/raxoft/miguel) [![Donate](https://img.shields.io/badge/support-donate-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=paypal%40raxoft%2ecz&item_name=Miguel%20%2d%20Database%20migration%20tool&no_shipping=1&return=https%3a%2f%2fgithub%2ecom%2fraxoft%2fmiguel&cancel_return=https%3a%2f%2fgithub%2ecom%2fraxoft%2fmiguel&cn=Optional%20Feedback&tax=0&currency_code=EUR&bn=PP%2dDonationsBF&charset=UTF%2d8)
 
 Miguel is a tool for sane management of database schemas. It aims to help with these goals:
 
@@ -10,7 +10,7 @@ Miguel is a tool for sane management of database schemas. It aims to help with t
 
 To achieve this, it provides the following features:
 
-* [Sequel](http://sequel.jeremyevans.net/)-like DSL for schema description with some enhancements.
+* [Sequel][]-like DSL for schema description with some enhancements.
 * Load schema from given description file or from given database.
 * Show changes necessary to turn one schema into another.
 * Render those changes as Sequel's change or up/down migrations.
@@ -110,22 +110,30 @@ See documentation of the `set_defaults` method for details.
 The preset defaults are like this:
 
 ``` ruby
-set_defaults :global, :null => false
-set_defaults :primary_key, :type => :integer, :unsigned => true
-set_defaults :foreign_key, :key => :id, :type => :integer, :unsigned => true
-set_defaults :unique, :index, :unique => true
+set_defaults :global, null: false
+
 set_defaults :Bool, :TrueClass
-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 :Text, :String, :text => true
-set_defaults :Time, :timestamp, :default => 0
-set_defaults :Time?, :timestamp, :default => nil
+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 :Text, :String, text: true
+set_defaults :Time, :timestamp, default: '0000-00-00 00:00:00'
+set_defaults :Time?, :timestamp, default: nil
+
+set_defaults :unique, :index, unique: true
+
+set_defaults :primary_key, type: :integer, unsigned: false
+set_defaults :foreign_key, key: :id, type: :integer, unsigned: false
 ```
 
-Finally, the `timestamp` helper can be used to create the
+If you prefer unsigned keys instead and your database engine supports it,
+you can pass the `unsigned_keys: true` option to `define` to make it happen.
+
+Finally, the `timestamps` helper can be used to create the
 `create_time` and `update_time` timestamps for you.
+If you pass the `mysql_timestamps: true` option to `define`,
+the `update_time` timestamp will have the MySQL auto-update feature enabled.
 
 ## Using the command
 
@@ -145,10 +153,13 @@ the command will always ask for a confirmation before changing anything in the d
 (unless you use the `--force` option).
 
 Databases can be specified either by their Sequel URL like
+`sqlite://test.db`
+or
 `mysql2://user:password@localhost/main`,
 or by the common database `.yml` config file:
 
 ``` yaml
+# Example db.yml.
 adapter: mysql2
 user: jim
 password: sup3rsecr3t
@@ -176,12 +187,15 @@ leaving dozens of piecewise migration files finally behind.
 
 ## Limitations
 
-The type support is geared towards the MySQL, especially the timestamp types.
+The database specific type support is geared towards [MySQL][] and [SQLite][].
 Generic types should work with any database, but your mileage may vary.
 
-It is currently not possible to describe renaming of columns.
+Changing the type of primary keys can be as problematic as with normal Sequel migrations,
+so it's best to set them once and stick with them.
+
+It is currently not possible to describe renaming of columns or tables.
 If you need that,
-simply rename the columns directly in the database or by using standard Sequel migration,
+simply rename them directly in the database or by using standard Sequel migration,
 and adjust the schema description accordingly.
 
 ## Credits
@@ -189,3 +203,7 @@ and adjust the schema description accordingly.
 Copyright © 2015 Patrik Rak
 
 Miguel is released under the MIT license.
+
+[Sequel]: http://sequel.jeremyevans.net/
+[MySQL]: https://www.mysql.com/
+[SQLite]: https://www.sqlite.org/

data/examples/schema.rb

@@ -126,7 +126,7 @@ Miguel::Schema.define do
 
   # User's followers.
 
-  join_table :user_id, :user, :follower_id, :user, :user_followers
+  join_table :user_id, :users, :follower_id, :users, :user_followers
 
 end
 

data/lib/miguel/command.rb

@@ -163,19 +163,27 @@ module Miguel
       db = if name.nil? or name.empty?
         fail "Missing database name."
       elsif File.exist?( name )
-        require 'yaml'
-        config = YAML.load_file( name )
-        env = self.env || "development"
-        config = config[ env ] || config[ env.to_sym ] || config
-        config.keys.each{ |k| config[ k.to_sym ] = config.delete( k ) }
+        config = load_db_config( name )
         Sequel.connect( config )
-      else
+      elsif name =~ /:\/\//
         Sequel.connect( name )
+      else
+        fail "Database config #{name} not found."
       end
       db.loggers = loggers
       db
     end
 
+    # Load database config from given file.
+    def load_db_config( name )
+      require 'yaml'
+      config = YAML.load_file( name )
+      env = self.env || "development"
+      config = config[ env ] || config[ env.to_sym ] || config
+      config.keys.each{ |k| config[ k.to_sym ] = config.delete( k ) }
+      config
+    end
+
     # Show changes between the two schemas.
     def show_changes( from, to )
       m = Migrator.new

data/lib/miguel/importer.rb

@@ -17,7 +17,7 @@ module Miguel
 
     private
 
-    # Which characrets we convert when parsing enum values.
+    # Which characters we convert when parsing enum values.
     # Quite likely not exhaustive, but sufficient for our purposes.
     ESCAPED_CHARS = {
       "''" => "'",
@@ -56,19 +56,24 @@ module Miguel
         when /\A(enum|set)\((.*)\)\z/
           return $1.to_sym, :elements => parse_elements( $2 )
         end
+      when :sqlite
+        case type
+        when /\Ainteger UNSIGNED\z/
+          return :integer, :unsigned => true
+        end
       end
 
       case type
       when /\Avarchar/
-        return :string, :default_size => 255
+        return :String, :default_size => 255
       when /\Achar/
-        return :string, :fixed => true, :default_size => 255
+        return :String, :fixed => true, :default_size => 255
       when /\Atext\z/
-        return :string, :text => true
+        return :String, :text => true
       when /\A(\w+)\([\s\d,]+\)\z/
         return $1.to_sym
       when /\A\w+\z/
-        return type
+        return type.to_sym
       end
 
       ruby_type
@@ -98,6 +103,28 @@ module Miguel
       [ type, opts ]
     end
 
+    # Types we support for default values. Anything else is converted to String.
+    DEFAULT_TYPES = [ String, Numeric, TrueClass, FalseClass ]
+
+    # Convert given database default of given type to default used by our schema definitions.
+    def revert_default( type, default, ruby_default )
+      default = ruby_default unless ruby_default.nil?
+      return if default.nil?
+
+      default = default.to_s unless DEFAULT_TYPES.any?{ |x| default.is_a?( x ) }
+
+      if type.to_s =~ /date|time/
+        case default
+        when /\A'([-: \d]+)'\z/
+          default = $1
+        when 'CURRENT_TIMESTAMP'
+          # This matches our use of MySQL timestamps in schema definitions.
+          default = Sequel.lit('CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP')
+        end
+      end
+      default
+    end
+
     # Import indexes of given table.
     def import_indexes( table )
       # Foreign keys also automatically create indexes, which we must exclude when importing.
@@ -122,12 +149,6 @@ module Miguel
       end
     end
 
-    # Our custom mapping of some database defaults into the values we use in our schemas.
-    DEFAULT_CONSTANTS = {
-      "0000-00-00 00:00:00" => 0,
-      "CURRENT_TIMESTAMP" => Sequel.lit("CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP"),
-    }
-
     # Options which are ignored for columns.
     # These are usually just schema hints which the user normally doesn't specify.
     IGNORED_OPTS = [ :max_length ]
@@ -169,11 +190,9 @@ module Miguel
         default = opts.delete( :default )
         ruby_default = opts.delete( :ruby_default )
 
-        default = DEFAULT_CONSTANTS[ default ] || ( ruby_default.nil? ? default : ruby_default )
+        default = revert_default( type, default, ruby_default )
 
-        unless default.nil?
-          opts[ :default ] = default
-        end
+        opts[ :default ] = default unless default.nil?
 
         # Deal with primary keys, which is a bit obscure because of the auto-increment handling.
 

data/lib/miguel/schema.rb

@@ -17,9 +17,9 @@ module Miguel
       def out_value( value )
         case value
         when Hash
-          "{" << ( value.map{ |k,v| "#{out_value( k )} => #{out_value( v )}" }.join( ', ' ) ) << "}"
+          "{#{ value.map{ |k,v| "#{out_value( k )} => #{out_value( v )}" }.join( ', ' ) }}"
         when Array
-          "[" << ( value.map{ |v| out_value( v ) }.join( ', ' ) ) << "]"
+          "[#{ value.map{ |v| out_value( v ) }.join( ', ' ) }]"
         when Sequel::LiteralString
           "Sequel.lit(#{value.to_s.inspect})"
         else
@@ -131,12 +131,22 @@ module Miguel
         CANONIC_TYPES[ t ] || t
       end
 
+      # Convert given size into its canonic form.
+      def canonic_size( size )
+        if canonic_type == :decimal && size.is_a?( Integer )
+          [ size, 0 ]
+        else
+          size
+        end
+      end
+
       # Default options implied for certain types.
       DEFAULT_OPTS = {
         :string => { :size => 255 },
         :bigint => { :size => 20 },
         :decimal => { :size => [ 10, 0 ] },
         :integer => { :unsigned => false },
+        :primary_key => { :unsigned => false, :type => :integer },
       }
 
       # Options which are ignored for columns.
@@ -149,6 +159,7 @@ module Miguel
         o = { :type => canonic_type, :default => default }
         o.merge!( DEFAULT_OPTS[ canonic_type ] || {} )
         o.merge!( opts )
+        o[ :size ] = canonic_size( o[ :size ] )
         o.delete_if{ |key, value| IGNORED_OPTS.include? key }
       end
 
@@ -229,7 +240,9 @@ module Miguel
 
       # Get the foreign key options, in a canonic way.
       def canonic_opts
-        opts.reject{ |key, value| IGNORED_OPTS.include? key }
+        o = { :on_update => :no_action, :on_delete => :no_action }
+        o.merge!( opts )
+        o.delete_if{ |key, value| IGNORED_OPTS.include? key }
       end
 
       # Compare one foreign key with another one.
@@ -274,15 +287,21 @@ module Miguel
 
         # Create the default timestamp fields.
         def timestamps
-          # Unfortunately, MySQL allows only either automatic create timestamp
-          # (DEFAULT CURRENT_TIMESTAMP) or automatic update timestamp (DEFAULT
-          # CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP), but not both - one
-          # has to be updated manually anyway. So we choose to have the update timestamp
-          # automatically updated, and let the create one to be set manually.
-          # Also, Sequel doesn't currently honor :on_update for column definitions,
-          # so we have to use default literal to make it work. Sigh.
-          timestamp :create_time, :null => false, :default => 0
-          timestamp :update_time, :null => false, :default => Sequel.lit( 'CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP' )
+          opts = @table.schema.opts
+          if opts[ :mysql_timestamps ]
+            # Unfortunately, MySQL allows only either automatic create timestamp
+            # (DEFAULT CURRENT_TIMESTAMP) or automatic update timestamp (DEFAULT
+            # CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP), but not both - one
+            # has to be updated manually anyway. So we choose to have the update timestamp
+            # automatically updated, and let the create one to be set manually.
+            # Also, Sequel doesn't currently honor :on_update for column definitions,
+            # so we have to use default literal to make it work. Sigh.
+            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' )
+          else
+            Time :create_time
+            Time :update_time
+          end
         end
       end
 
@@ -373,12 +392,16 @@ module Miguel
 
     end
 
+    # Schema options.
+    attr_reader :opts
+
     # Create new schema.
-    def initialize
+    def initialize( opts = {} )
       @tables = {}
       @aliases = {}
       @defaults = {}
       @callbacks = {}
+      @opts = self.class.default_options.merge(opts)
     end
 
     # Get all tables.
@@ -452,6 +475,15 @@ module Miguel
       @defaults[ name ] = args.pop if args.last.is_a? Hash
       @callbacks[ name ] = block
       fail( ArgumentError, "invalid defaults for #{name}" ) unless args.empty?
+      self
+    end
+
+    # Clear defaults and aliases for given statement.
+    def clear_defaults( name )
+      @aliases.delete( name )
+      @defaults.delete( name )
+      @callbacks.delete( name )
+      self
     end
 
     # Get default options for given statement.
@@ -464,31 +496,41 @@ module Miguel
     # The current set of defaults is as follows:
     #
     #   :global, :null => false
-    #   :primary_key, :type => :integer, :unsigned => true
-    #   :foreign_key, :key => :id, :type => :integer, :unsigned => true
-    #   :unique, :index, :unique => true
+    #
     #   :Bool, :TrueClass
     #   :True, :TrueClass, :default => true
     #   :False, :TrueClass, :default => false
     #   :Signed, :integer, :unsigned => false
     #   :Unsigned, :integer, :unsigned => true
     #   :Text, :String, :text => true
-    #   :Time, :timestamp, :default => 0
+    #   :Time, :timestamp, :default => '0000-00-00 00:00:00'
     #   :Time?, :timestamp, :default => nil
-    def set_standard_defaults
+    #
+    #   :unique, :index, :unique => true
+    #
+    #   :primary_key, :type => :integer, :unsigned => false
+    #   :foreign_key, :key => :id, :type => :integer, :unsigned => false
+    #
+    # If the +unsigned_keys+ option is set to true, the keys
+    # are set up to use unsigned integers instead.
+    def set_standard_defaults( opts = self.opts )
 
       # We set NOT NULL on everything by default, but note the ?
       # syntax (like Text?) which declares the column as NULL.
-      # We also like our keys unsigned, so we make that a default, too.
+
+      set_defaults :global, :null => false
+
+      # We also like our keys unsigned, so we allow setting that, too.
       # Unfortunately, :unsigned currently works only with :integer,
       # not the default :Integer, and :integer can't be specified for compound keys,
       # so we have to use the callback to set the type only at correct times.
 
-      set_defaults :global, :null => false
-      set_defaults :primary_key, :unsigned => true do |opts,args,table|
+      unsigned_keys = !! opts[ :unsigned_keys ]
+
+      set_defaults :primary_key, :unsigned => unsigned_keys do |opts,args,table|
         opts[ :type ] ||= :integer unless args.first.is_a? Array
       end
-      set_defaults :foreign_key, :key => :id, :unsigned => true do |opts,args,table|
+      set_defaults :foreign_key, :key => :id, :unsigned => unsigned_keys do |opts,args,table|
         opts[ :type ] ||= :integer unless args.first.is_a? Array
       end
 
@@ -511,7 +553,7 @@ module Miguel
       # we have to be careful to turn off the MySQL autoupdate behavior.
       # That's why we have to set defaults explicitly.
 
-      set_defaults :Time, :timestamp, :default => 0
+      set_defaults :Time, :timestamp, :default => '0000-00-00 00:00:00'
       set_defaults :Time?, :timestamp, :default => nil
 
       self
@@ -551,7 +593,7 @@ module Miguel
     end
 
     # Define schema with the provided block.
-    def define( opts = {}, &block )
+    def define( &block )
       fail( ArgumentError, "missing schema block" ) unless block
       set_standard_defaults unless opts[ :use_defaults ] == false
       instance_eval &block
@@ -560,22 +602,69 @@ module Miguel
 
     class << self
 
-      # The most recent schema defined by Schema.define.
-      attr_reader :schema
+      # Mutex protecting access to thread sensitive variables.
+      LOCK = Mutex.new
+
+      # Get default schema options.
+      def default_options
+        sync{ @opts || {} }
+      end
+
+      # Set default schema options.
+      def default_options=( opts )
+        sync{ @opts = opts.nil? ? nil : opts.dup }
+      end
+      alias set_default_options default_options=
 
       # Define schema with provided block.
       def define( opts = {}, &block )
-        @schema = new.define( opts, &block )
+        set_schema( new( opts ).define( &block ) )
       end
 
       # Load schema from given file.
-      def load( name )
-        @schema = nil
+      def load( name, opts = {} )
         name = File.expand_path( name )
-        Kernel.load( name )
+        sync do
+          get_schema do
+            with_options( opts ) do
+              Kernel.load( name )
+            end
+          end
+        end
+      end
+
+      private
+
+      # Serialize access to thread sensitive variables.
+      def sync( &block )
+        LOCK.synchronize &block
+      rescue ThreadError
+        yield
+      end
+
+      # Store given schema for later if requested.
+      def set_schema( schema )
+        sync{ @schema = schema if @schema == self }
         schema
       end
 
+      # Execute given block and return stored schema.
+      def get_schema
+        @schema = self
+        yield
+        @schema unless @schema == self
+      ensure
+        @schema = nil
+      end
+
+      # Execute block with given options.
+      def with_options( opts )
+        saved, @opts = @opts, default_options.merge(opts)
+        yield
+      ensure
+        @opts = saved
+      end
+
     end
 
   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 + '.pre2'
+  s.version     = Miguel::VERSION + '.pre3'
   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

data/test/data/schema.rb

@@ -0,0 +1,100 @@
+# Test schema.
+
+Miguel::Schema.define do
+
+  table :sequel_types do
+    Integer :a0                         # integer
+    String :a1                          # varchar(255)
+    String :a2, :size=>50               # varchar(50)
+    String :a3, :fixed=>true            # char(255)
+    String :a4, :fixed=>true, :size=>50 # char(50)
+    String :a5, :text=>true             # text
+    File :b                             # blob
+    Fixnum :c                           # integer
+    Bignum :d                           # bigint
+    Float :e                            # double precision
+    BigDecimal :f                       # numeric
+    BigDecimal :f2, :size=>10           # numeric(10)
+    BigDecimal :f3, :size=>[10, 2]      # numeric(10, 2)
+    Date :g                             # date
+    DateTime :h                         # timestamp
+    Time :i                             # timestamp
+    Numeric :j                          # numeric
+    TrueClass :k                        # boolean
+    FalseClass :l                       # boolean
+  end
+
+  table :miguel_types do
+    String :string
+    Text :text
+    File :blob
+    Integer :int
+    Signed :signed
+    Unsigned :unsigned
+    Float :float
+    Bool :bool
+    True :true
+    False :false
+    Time :t
+  end
+
+  table :timestamps do
+    Time :t1
+    Time? :t2
+    timestamps
+  end
+
+  table :users do
+    primary_key :id
+    String :name
+    unique :name
+  end
+
+  table :simple do
+    primary_key :id
+    foreign_key :user_id, :users
+    index :user_id
+  end
+
+  table :reuse do
+    primary_key :user_id
+    foreign_key [:user_id], :users
+  end
+
+  table :compound do
+    Unsigned :a
+    Unsigned :b
+    primary_key [:a, :b]
+    foreign_key [:b, :a], :compound, key: [:a, :b]
+    String :c
+    Signed :d
+    unique [:a, :c]
+    index [:b, :c, :d]
+    index [:b, :a]
+  end
+
+  table :null do
+    String? :string
+    Text? :text
+    File? :blob
+    Integer? :int
+    Signed? :signed
+    Unsigned? :unsigned
+    Float? :float
+    Bool? :bool
+    True? :true
+    False? :false
+    Time? :t
+    foreign_key? :user_id, :users
+  end
+
+  join_table :user_id, :users, :simple_id, :simple
+
+  join_table :left_id, :users, :right_id, :users, :self_join do
+    timestamps
+    index :create_time
+  end
+
+end
+
+# EOF #

data/test/data/schema.txt

@@ -0,0 +1,100 @@
+table :sequel_types do
+  Integer :a0, :null => false
+  String :a1, :null => false
+  String :a2, :null => false, :size => 50
+  String :a3, :null => false, :fixed => true
+  String :a4, :null => false, :fixed => true, :size => 50
+  String :a5, :null => false, :text => true
+  File :b, :null => false
+  Fixnum :c, :null => false
+  Bignum :d, :null => false
+  Float :e, :null => false
+  BigDecimal :f, :null => false
+  BigDecimal :f2, :null => false, :size => 10
+  BigDecimal :f3, :null => false, :size => [10, 2]
+  Date :g, :null => false
+  DateTime :h, :null => false
+  timestamp :i, :null => false, :default => "0000-00-00 00:00:00"
+  Numeric :j, :null => false
+  TrueClass :k, :null => false
+  FalseClass :l, :null => false
+end
+table :miguel_types do
+  String :string, :null => false
+  String :text, :null => false, :text => true
+  File :blob, :null => false
+  Integer :int, :null => false
+  integer :signed, :null => false, :unsigned => false
+  integer :unsigned, :null => false, :unsigned => true
+  Float :float, :null => false
+  TrueClass :bool, :null => false
+  TrueClass :true, :null => false, :default => true
+  TrueClass :false, :null => false, :default => false
+  timestamp :t, :null => false, :default => "0000-00-00 00:00:00"
+end
+table :timestamps do
+  timestamp :t1, :null => false, :default => "0000-00-00 00:00:00"
+  timestamp :t2, :null => true, :default => nil
+  timestamp :create_time, :null => false, :default => "0000-00-00 00:00:00"
+  timestamp :update_time, :null => false, :default => "0000-00-00 00:00:00"
+end
+table :users do
+  primary_key :id, :null => false, :unsigned => false, :type => :integer
+  String :name, :null => false
+  index [:name], :null => false, :unique => true
+end
+table :simple do
+  primary_key :id, :null => false, :unsigned => false, :type => :integer
+  integer :user_id, :null => false, :key => [:id], :unsigned => false, :type => :integer
+  index [:user_id], :null => false
+  foreign_key [:user_id], :users, :null => false, :key => [:id], :unsigned => false, :type => :integer
+end
+table :reuse do
+  primary_key :user_id, :null => false, :unsigned => false, :type => :integer
+  foreign_key [:user_id], :users, :null => false, :key => [:id], :unsigned => false
+end
+table :compound do
+  integer :a, :null => false, :unsigned => true
+  integer :b, :null => false, :unsigned => true
+  primary_key [:a, :b], :null => false, :unsigned => false
+  String :c, :null => 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
+  foreign_key [:b, :a], :compound, :null => false, :key => [:a, :b], :unsigned => false
+end
+table :null do
+  String :string, :null => true
+  String :text, :null => true, :text => true
+  File :blob, :null => true
+  Integer :int, :null => true
+  integer :signed, :null => true, :unsigned => false
+  integer :unsigned, :null => true, :unsigned => true
+  Float :float, :null => true
+  TrueClass :bool, :null => true
+  TrueClass :true, :null => true, :default => true
+  TrueClass :false, :null => true, :default => false
+  timestamp :t, :null => true, :default => nil
+  integer :user_id, :null => true, :key => [:id], :unsigned => false, :type => :integer
+  foreign_key [:user_id], :users, :null => true, :key => [:id], :unsigned => false, :type => :integer
+end
+table :simple_users do
+  integer :user_id, :null => false, :key => [:id], :unsigned => false, :type => :integer
+  integer :simple_id, :null => false, :key => [:id], :unsigned => false, :type => :integer
+  primary_key [:user_id, :simple_id], :null => false, :unsigned => false
+  index [:simple_id, :user_id], :null => false, :unique => true
+  foreign_key [:user_id], :users, :null => false, :key => [:id], :unsigned => false, :type => :integer
+  foreign_key [:simple_id], :simple, :null => false, :key => [:id], :unsigned => false, :type => :integer
+end
+table :self_join do
+  integer :left_id, :null => false, :key => [:id], :unsigned => false, :type => :integer
+  integer :right_id, :null => false, :key => [:id], :unsigned => false, :type => :integer
+  primary_key [:left_id, :right_id], :null => false, :unsigned => false
+  timestamp :create_time, :null => false, :default => "0000-00-00 00:00:00"
+  timestamp :update_time, :null => false, :default => "0000-00-00 00:00:00"
+  index [:right_id, :left_id], :null => false, :unique => true
+  index [:create_time], :null => false
+  foreign_key [:left_id], :users, :null => false, :key => [:id], :unsigned => false, :type => :integer
+  foreign_key [:right_id], :users, :null => false, :key => [:id], :unsigned => false, :type => :integer
+end

data/test/data/simple.rb

@@ -0,0 +1,16 @@
+# Simple schema.
+
+Miguel::Schema.define do
+
+  table :items do
+    primary_key :id
+    String :name
+    foreign_key :parent_id, :items
+    timestamps
+    unique :name
+    index :parent_id
+  end
+
+end
+
+# EOF #

data/test/data/simple.txt

@@ -0,0 +1,10 @@
+table :items do
+  primary_key :id, :null => false, :unsigned => false, :type => :integer
+  String :name, :null => false
+  integer :parent_id, :null => false, :key => [:id], :unsigned => false, :type => :integer
+  timestamp :create_time, :null => false, :default => "0000-00-00 00:00:00"
+  timestamp :update_time, :null => false, :default => "0000-00-00 00:00:00"
+  index [:name], :null => false, :unique => true
+  index [:parent_id], :null => false
+  foreign_key [:parent_id], :items, :null => false, :key => [:id], :unsigned => false, :type => :integer
+end

data/test/data/simple_mysql.txt

@@ -0,0 +1,10 @@
+table :items do
+  primary_key :id, :null => false, :unsigned => true, :type => :integer
+  String :name, :null => 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")
+  index [:name], :null => false, :unique => true
+  index [:parent_id], :null => false
+  foreign_key [:parent_id], :items, :null => false, :key => [:id], :unsigned => true, :type => :integer
+end

data/test/test_schema.rb

@@ -0,0 +1,47 @@
+# Test Schema.
+
+require 'miguel/schema'
+
+describe Miguel::Schema do
+
+  DATA_DIR = File.expand_path( "#{__FILE__}/../data" )
+
+  def data( name )
+    "#{DATA_DIR}/#{name}"
+  end
+
+  should 'load and dump schema properly' do
+    schema = Miguel::Schema.load( data( 'schema.rb' ) )
+    schema.dump.to_s.should == File.read( data( 'schema.txt' ) )
+  end
+
+  should 'allow changing default schema options temporarily' do
+    schema = Miguel::Schema.load( data( 'simple.rb' ), unsigned_keys: true, mysql_timestamps: true )
+    schema.dump.to_s.should == File.read( data( 'simple_mysql.txt' ) )
+    Miguel::Schema.new.opts.should.be.empty
+
+    schema = Miguel::Schema.load( data( 'simple.rb' ) )
+    schema.dump.to_s.should == File.read( data( 'simple.txt' ) )
+  end
+
+  should 'allow changing default schema options permanently' do
+    Miguel::Schema.default_options.should == {}
+
+    Miguel::Schema.set_default_options( unsigned_keys: true, mysql_timestamps: true )
+    Miguel::Schema.new( test: true ).opts.should == { unsigned_keys: true, mysql_timestamps: true, test: true }
+    Miguel::Schema.default_options.should == { unsigned_keys: true, mysql_timestamps: true }
+
+    schema = Miguel::Schema.load( data( 'simple.rb' ) )
+    schema.dump.to_s.should == File.read( data( 'simple_mysql.txt' ) )
+
+    Miguel::Schema.default_options = nil
+    Miguel::Schema.default_options.should == {}
+    Miguel::Schema.new.opts.should.be.empty
+
+    schema = Miguel::Schema.load( data( 'simple.rb' ) )
+    schema.dump.to_s.should == File.read( data( 'simple.txt' ) )
+  end
+
+end
+
+# EOF #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miguel
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre2
+  version: 0.1.0.pre3
 platform: ruby
 authors:
 - Patrik Rak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-17 00:00:00.000000000 Z
+date: 2015-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -64,7 +64,13 @@ files:
 - lib/miguel/schema.rb
 - lib/miguel/version.rb
 - miguel.gemspec
+- test/data/schema.rb
+- test/data/schema.txt
+- test/data/simple.rb
+- test/data/simple.txt
+- test/data/simple_mysql.txt
 - test/test_dumper.rb
+- test/test_schema.rb
 homepage: http://rubygems.org/gems/miguel
 licenses:
 - MIT