miguel 0.1.0.pre3 → 0.1.0.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be756726f39332cdc296e5a236f934748da5676d
-  data.tar.gz: bac00b2ce0a29b8e020f78c5bb76bf41b4185ac7
+  metadata.gz: dbf13dd299009fb0beefd95d64b4a1b3bfba5be5
+  data.tar.gz: 0f4558c6faa5826150e998fb900706ea84bb65a1
 SHA512:
-  metadata.gz: d7ff9bb4c91af68d0902e63f3bf4616ffece4be5015ed3517cf5915f86632f1dd60a8d3f37b7c1271803795c79f4de9d9ab70d1ff5194002562bdd06897b6aa4
-  data.tar.gz: 2d1ca527b7bf924d5fb571c1a320d86030e9a004c4bd13c106c41fd795f571e079c1359ead9f4dd11e7e301a6ba534244a7b8a9f53a0fc680a7036e53533d258
+  metadata.gz: 30b5da0b99408f21db2c16658c1451f19c0e76dc3398c8edce4881d9339eb07a2ee113a4fcb8cd0aca1e16cd23d03432842169f780399c94580a0a92cf7ecee1
+  data.tar.gz: c6bf941afb95fa42763aa62c0d49376aacca8b32fe6d044d753fffbad2184f7a811edafc107ae46eb7572f44ba2b677cf901e5635572e848db0650c3ba23a2e1

data/.travis.gemfile

@@ -5,6 +5,21 @@ source 'https://rubygems.org'
 gem 'rake'
 gem 'bacon', '~> 1.2'
 gem 'sequel', '~> 4.0'
-gem 'sqlite3', '~> 1.3'
+
+platforms :ruby do
+  gem 'sqlite3'
+  gem 'mysql2'
+  gem 'pg'
+end
+
+platforms :jruby do
+  gem 'jdbc-sqlite3'
+  gem 'jdbc-mysql'
+  gem 'jdbc-postgres'
+end
+
+if ENV[ 'CODECLIMATE_REPO_TOKEN' ]
+  gem 'codeclimate-test-reporter'
+end
 
 # EOF #

data/.travis.yml

@@ -1,3 +1,5 @@
+# TravisCI config.
+
 language: ruby
 rvm:
   - ruby-head
@@ -9,8 +11,14 @@ rvm:
   - jruby-head
   - jruby-19mode
 gemfile: .travis.gemfile
+env:
+  global:
+    # travis encrypt CODECLIMATE_REPO_TOKEN=???
+    secure: WjkizgQWf8gx1KIfPsX99TR6uJgnF9ybHUtu/kz0JHWYNif8IJ7qsO+kCXzdGtTiwMgQL4cHzYqbGa6VAiiPQMmG9NPLZ1Q4STLW9W4afg2lOqQmyGk0iSapEu/YXlWM6kZW4IcY/4BG8DzgfJnzy6+4yWBGZFdMwcpJEVZpy02c3Y6RBsrFJ6wz1BpWZR8bHaFXrLzfpHeS8t8h1OYetf1RLg9MvPvankkoIBBxw6ahV9QhG1O2cXyzlfH30wQA90stTFOybUkJ/hVLlCXyxEbjuhUKTWeU4s/Uw5XhA3k5ll0GWyaTUQU3aSWwTDv2Z/dncwR2y8RMuGJqHVLcTz2jtb+NINncrYq5ybGUaCNpdJea7/OS4R6M9t2VS666j5dPN4tVsTgyAONzgHHEmTYwHk3s9s4EKyoHAl398Kv/dazwSmBasvc1kIDzsi6n83k4MHMSNFTBlA4Jz0LaQ7Qx0hxS7MIsGhDmVeeEOQOw1idof6hQdBCpcLfO9NCxqRFWYAgK99U5mXjqRWBeQGyEwrtgbvyweanDrFfHtVEQpUrW1Do4zNz9jZ+MS43hKViu3loH3y20w8Vi96UXWoDp/RreLGMpM33V3xzCC+U3Ex1Dckoq0TgQ8RFD3U/d0KdQJ02B8C3iRmNqD43jGJEJl5USnT58gwgPumLwoCs=
 matrix:
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-19mode
     - rvm: jruby-head
+
+# EOF #

data/README.md

@@ -129,6 +129,8 @@ set_defaults :foreign_key, key: :id, type: :integer, unsigned: false
 
 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.
+If you don't want any of these defaults set up for you,
+pass the `use_defaults: false` option to define instead.
 
 Finally, the `timestamps` helper can be used to create the
 `create_time` and `update_time` timestamps for you.
@@ -190,7 +192,7 @@ leaving dozens of piecewise migration files finally behind.
 The database specific type support is geared towards [MySQL][] and [SQLite][].
 Generic types should work with any database, but your mileage may vary.
 
-Changing the type of primary keys can be as problematic as with normal Sequel migrations,
+Changing 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.

data/lib/miguel/importer.rb

@@ -103,15 +103,18 @@ 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 ) }
+      case default
+      when String, Numeric, TrueClass, FalseClass
+      when DateTime
+        default = default.strftime( '%F %T' )
+      else
+        default = default.to_s
+      end
 
       if type.to_s =~ /date|time/
         case default

data/lib/miguel/migrator.rb

@@ -21,6 +21,14 @@ module Miguel
       ]
     end
 
+    # Iterate over matching pairs of named items.
+    def each_pair( name, from_items, to_items )
+      for from, to in from_items.zip( to_items )
+        fail "invalid #{name} pair #{from.name} -> #{to.name}" unless from.name == to.name
+        yield from, to
+      end
+    end
+
     # Convert foreign keys from given tables into [ table name, foreign key ] pairs for easier comparison.
     def prepare_keys( tables )
       result = []
@@ -41,25 +49,26 @@ module Miguel
       result
     end
 
-    # Generate code for adding given foreign keys.
-    def dump_add_foreign_keys( out, table_keys )
+    # Generate code for altering given foreign keys.
+    def dump_foreign_keys( out, table_keys, &block )
       for name, keys in split_keys( table_keys )
         out.dump "alter_table #{name.inspect}" do
-          for key in keys
-            out << "add_foreign_key #{key.out_columns}, #{key.out_table_name}#{key.out_canonic_opts}"
-          end
+          keys.each &block
         end
       end
     end
 
+    # Generate code for adding given foreign keys.
+    def dump_add_foreign_keys( out, table_keys )
+      dump_foreign_keys( out, table_keys ) do |key|
+        out << "add_foreign_key #{key.out_columns}, #{key.out_table_name}#{key.out_canonic_opts}"
+      end
+    end
+
     # Generate code for dropping given foreign keys.
     def dump_drop_foreign_keys( out, table_keys )
-      for name, keys in split_keys( table_keys )
-        out.dump "alter_table #{name.inspect}" do
-          for key in keys
-            out << "drop_foreign_key #{key.out_columns} # #{key.out_table_name}#{key.out_canonic_opts}"
-          end
-        end
+      dump_foreign_keys( out, table_keys ) do |key|
+        out << "drop_foreign_key #{key.out_columns} # #{key.out_table_name}#{key.out_canonic_opts}"
       end
     end
 
@@ -126,7 +135,7 @@ module Miguel
       if from.allow_null != to.allow_null && to.allow_null
         out << "set_column_allow_null #{to.out_name}"
       end
-      if from.type_opts != to.type_opts
+      if from.canonic_type != to.canonic_type || from.type_opts != to.type_opts
         out << "set_column_type #{to.out_name}, #{to.out_type}#{to.out_opts}"
       end
       if from.default != to.default
@@ -139,9 +148,7 @@ module Miguel
 
     # Generate code for altering given columns.
     def dump_alter_columns( out, from_columns, to_columns )
-      pairs = from_columns.zip( to_columns )
-      for from, to in pairs
-        fail "invalid column pair #{from.name} -> #{to.name}" unless from.name == to.name
+      each_pair( :column, from_columns, to_columns ) do |from, to|
         dump_alter_column( out, from, to )
       end
     end
@@ -176,9 +183,7 @@ module Miguel
 
     # Generate code for altering given tables.
     def dump_alter_tables( out, from_tables, to_tables )
-      pairs = from_tables.zip( to_tables )
-      for from, to in pairs
-        fail "invalid table pair #{from.name} -> #{to.name}" unless from.name == to.name
+      each_pair( :table, from_tables, to_tables ) do |from, to|
         dump_alter_table( out, from, to )
       end
     end

data/lib/miguel/schema.rb

@@ -9,6 +9,9 @@ module Miguel
   # Class for defining database schema.
   class Schema
 
+    # String denoting zero time.
+    ZERO_TIME = '0000-00-00 00:00:00'.freeze
+
     # Module for pretty printing of names, types, and especially options.
     module Output
 
@@ -146,6 +149,7 @@ module Miguel
         :bigint => { :size => 20 },
         :decimal => { :size => [ 10, 0 ] },
         :integer => { :unsigned => false },
+        :time => { :only_time => true },
         :primary_key => { :unsigned => false, :type => :integer },
       }
 
@@ -156,7 +160,7 @@ module Miguel
       # Get the column options in a canonic way.
       def canonic_opts
         return {} if type == :primary_key && name.is_a?( Array )
-        o = { :type => canonic_type, :default => default }
+        o = { :type => canonic_type, :default => default, :null => true }
         o.merge!( DEFAULT_OPTS[ canonic_type ] || {} )
         o.merge!( opts )
         o[ :size ] = canonic_size( o[ :size ] )
@@ -296,7 +300,7 @@ module Miguel
             # 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 :create_time, :null => false, :default => ZERO_TIME
             timestamp :update_time, :null => false, :default => Sequel.lit( 'CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP' )
           else
             Time :create_time
@@ -553,7 +557,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 => '0000-00-00 00:00:00'
+      set_defaults :Time, :timestamp, :default => ZERO_TIME
       set_defaults :Time?, :timestamp, :default => nil
 
       self

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 + '.pre3'
+  s.version     = Miguel::VERSION + '.pre4'
   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

@@ -1,6 +1,6 @@
 # Test schema.
 
-Miguel::Schema.define do
+Miguel::Schema.define( use_defaults: false ) do
 
   table :sequel_types do
     Integer :a0                         # integer
@@ -17,13 +17,17 @@ Miguel::Schema.define do
     BigDecimal :f2, :size=>10           # numeric(10)
     BigDecimal :f3, :size=>[10, 2]      # numeric(10, 2)
     Date :g                             # date
-    DateTime :h                         # timestamp
-    Time :i                             # timestamp
+    #DateTime :h                        # timestamp or datetime
+    #Time :i                            # timestamp or datetime
+    Time :i2, :only_time=>true          # time
     Numeric :j                          # numeric
     TrueClass :k                        # boolean
     FalseClass :l                       # boolean
   end
 
+  set_standard_defaults
+  set_defaults :Custom, :String, fixed: true, size: 3
+
   table :miguel_types do
     String :string
     Text :text
@@ -35,7 +39,15 @@ Miguel::Schema.define do
     Bool :bool
     True :true
     False :false
-    Time :t
+    Time :time
+    Custom :custom
+  end
+
+  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'
   end
 
   table :timestamps do
@@ -88,6 +100,16 @@ Miguel::Schema.define do
     foreign_key? :user_id, :users
   end
 
+  table :defaults do
+    String :string, default: 'abc'
+    Integer :int, default: 10
+    Signed :signed, default: -1
+    Unsigned :unsigned, default: 1000
+    Float :float, default: 3.14
+    Bool :bool, default: true
+    Time :time, default: '2037-12-31 23:59:59'
+  end
+
   join_table :user_id, :users, :simple_id, :simple
 
   join_table :left_id, :users, :right_id, :users, :self_join do

data/test/data/schema.txt

@@ -1,23 +1,22 @@
 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
+  Integer :a0
+  String :a1
+  String :a2, :size => 50
+  String :a3, :fixed => true
+  String :a4, :fixed => true, :size => 50
+  String :a5, :text => true
+  File :b
+  Fixnum :c
+  Bignum :d
+  Float :e
+  BigDecimal :f
+  BigDecimal :f2, :size => 10
+  BigDecimal :f3, :size => [10, 2]
+  Date :g
+  Time :i2, :only_time => true
+  Numeric :j
+  TrueClass :k
+  FalseClass :l
 end
 table :miguel_types do
   String :string, :null => false
@@ -30,7 +29,14 @@ table :miguel_types do
   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"
+  timestamp :time, :null => false, :default => "0000-00-00 00:00:00"
+  String :custom, :null => false, :fixed => true, :size => 3
+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
   timestamp :t1, :null => false, :default => "0000-00-00 00:00:00"
@@ -79,6 +85,15 @@ table :null do
   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 :defaults do
+  String :string, :null => 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
+  Float :float, :null => false, :default => 3.14
+  TrueClass :bool, :null => false, :default => true
+  timestamp :time, :null => false, :default => "2037-12-31 23:59:59"
+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

data/test/helper.rb

@@ -0,0 +1,11 @@
+# Test helper.
+
+# Test coverage if enabled.
+
+begin
+  require "codeclimate-test-reporter"
+  CodeClimate::TestReporter.start
+rescue LoadError
+end
+
+# EOF #

data/test/test_dumper.rb

@@ -1,5 +1,6 @@
 # Test Dumper.
 
+require_relative 'helper'
 require 'miguel/dumper'
 
 describe Miguel::Dumper do

data/test/test_schema.rb

@@ -1,5 +1,6 @@
 # Test Schema.
 
+require_relative 'helper'
 require 'miguel/schema'
 
 describe Miguel::Schema do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miguel
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre3
+  version: 0.1.0.pre4
 platform: ruby
 authors:
 - Patrik Rak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-18 00:00:00.000000000 Z
+date: 2015-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -69,6 +69,7 @@ files:
 - test/data/simple.rb
 - test/data/simple.txt
 - test/data/simple_mysql.txt
+- test/helper.rb
 - test/test_dumper.rb
 - test/test_schema.rb
 homepage: http://rubygems.org/gems/miguel