miguel 0.1.0 → 0.2.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61b3d0863a5a9089a0d0721ada2efdb173dbfe98
-  data.tar.gz: d30974c4416aa48a0f9c1698877fc4851c875d3b
+  metadata.gz: db64f119440c5bd20619f533da327d507a3eeba4
+  data.tar.gz: 6e01ec299c5885be17dfd67e392310aec359e490
 SHA512:
-  metadata.gz: 7036e0cea3a88e677c17dbb8cb0775b11771b74c21e38fc032326f36029347c321893e6b1fd646027b374a53707701fc75d22e75bd15dc051375775c850c0ec5
-  data.tar.gz: 878b6ff4b7cf5f457da0207de21335783c9a806e3fc059694cf71dbc8c7de29e1e3d3fcc16ab3fa1f3410df85688c7a4f9339f0c79921847a8c12016b4b1447e
+  metadata.gz: 9256996f5840ec7d95c46c537120dccbdd40ab13ba9e679eaef08145f38b104389792c841697a13b62bdc3a892d36c2ef90d5fa2ce9265aeb410eb50bc66e40e
+  data.tar.gz: 7ad8d557c2c4aacbe3e9a5152f252517148920a8aa6cc5cba5775cd9ccb009d8b42157fe160dbe3864d9f2900643a1eeef2c1201ad003c43b7509198b8a7a4dd

data/.travis.yml

@@ -3,11 +3,15 @@
 language: ruby
 rvm:
   - ruby-head
-  - 2.2.3
-  - 2.1.7
+  - 2.6.3
+  - 2.5.5
+  - 2.4.6
+  - 2.3.8
+  - 2.2.10
+  - 2.1.10
   - 2.0.0
   - 1.9.3
-  - rbx-2
+  - rbx-3
   - jruby-head
   - jruby-19mode
 gemfile: .travis.gemfile
@@ -15,9 +19,12 @@ env:
   global:
     # travis encrypt CODECLIMATE_REPO_TOKEN=???
     secure: WjkizgQWf8gx1KIfPsX99TR6uJgnF9ybHUtu/kz0JHWYNif8IJ7qsO+kCXzdGtTiwMgQL4cHzYqbGa6VAiiPQMmG9NPLZ1Q4STLW9W4afg2lOqQmyGk0iSapEu/YXlWM6kZW4IcY/4BG8DzgfJnzy6+4yWBGZFdMwcpJEVZpy02c3Y6RBsrFJ6wz1BpWZR8bHaFXrLzfpHeS8t8h1OYetf1RLg9MvPvankkoIBBxw6ahV9QhG1O2cXyzlfH30wQA90stTFOybUkJ/hVLlCXyxEbjuhUKTWeU4s/Uw5XhA3k5ll0GWyaTUQU3aSWwTDv2Z/dncwR2y8RMuGJqHVLcTz2jtb+NINncrYq5ybGUaCNpdJea7/OS4R6M9t2VS666j5dPN4tVsTgyAONzgHHEmTYwHk3s9s4EKyoHAl398Kv/dazwSmBasvc1kIDzsi6n83k4MHMSNFTBlA4Jz0LaQ7Qx0hxS7MIsGhDmVeeEOQOw1idof6hQdBCpcLfO9NCxqRFWYAgK99U5mXjqRWBeQGyEwrtgbvyweanDrFfHtVEQpUrW1Do4zNz9jZ+MS43hKViu3loH3y20w8Vi96UXWoDp/RreLGMpM33V3xzCC+U3Ex1Dckoq0TgQ8RFD3U/d0KdQJ02B8C3iRmNqD43jGJEJl5USnT58gwgPumLwoCs=
+after_success:
+  - bundle exec codeclimate-test-reporter
 matrix:
   allow_failures:
     - rvm: ruby-head
+    - rvm: rbx-3
     - rvm: jruby-19mode
     - rvm: jruby-head
 before_script:

data/README.md

@@ -139,6 +139,8 @@ Finally, the `timestamps` helper can be used to create the
 If you pass the `mysql_timestamps: true` option to `define`,
 the `update_time` timestamp will have the MySQL auto-update feature enabled,
 and timestamps will use the `'0000-00-00 00:00:00'` default by default.
+The latter can be also enabled and disabled explicitly by setting
+the `zero_timestamps` option to `true` or `false`, respectively.
 
 ## Using the command
 
@@ -208,7 +210,7 @@ and adjust the schema description accordingly.
 
 ## Credits
 
-Copyright © 2015 Patrik Rak
+Copyright © 2015-2019 Patrik Rak
 
 Miguel is released under the MIT license.
 

data/lib/miguel/importer.rb

@@ -45,6 +45,8 @@ module Miguel
         return :integer, :unsigned => true, :default_size => 10
       when /\Abigint\(\d+\)\z/
         return :bigint, :default_size => 20
+      when /\Abigint\(\d+\) unsigned\z/
+        return :bigint, :unsigned => true, :default_size => 20
       when /\Adecimal\(\d+,\d+\)\z/
         return :decimal, :default_size => [ 10, 0 ]
       when /\A(enum|set)\((.*)\)\z/

data/lib/miguel/schema.rb

@@ -158,7 +158,7 @@ module Miguel
       # Default options implied for certain types.
       DEFAULT_OPTS = {
         :string => { :size => 255, :text => false },
-        :bigint => { :size => 20 },
+        :bigint => { :size => 20, :unsigned => false },
         :decimal => { :size => [ 10, 0 ] },
         :integer => { :unsigned => false },
         :time => { :only_time => true },
@@ -302,7 +302,7 @@ module Miguel
 
         # The +method_missing+ doesn't take care of constant like methods (like String :name),
         # so those have to be defined explicitly for each such supported type.
-        for type in Sequel::Schema::Generator::GENERIC_TYPES
+        for type in (defined?(Sequel::Schema::CreateTableGenerator) ? Sequel::Schema::CreateTableGenerator::GENERIC_TYPES : Sequel::Schema::Generator::GENERIC_TYPES)
           class_eval( "def #{type}(*args) ; @table.add_definition(:#{type},*args) ; end", __FILE__, __LINE__ )
         end
 
@@ -317,7 +317,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 => ZERO_TIME
+            timestamp :create_time, :null => false, :default => ( opts[ :zero_timestamps ] == false ? DEFAULT_TIME : ZERO_TIME )
             timestamp :update_time, :null => false, :default => Sequel.lit( 'CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP' )
           else
             Time :create_time
@@ -371,9 +371,9 @@ module Miguel
       end
 
       # Add foreign key definition.
-      def add_foreign_key( columns, table_name, *args )
-        add_column( :integer, columns, *args ) unless columns.is_a? Array
-        @foreign_keys << ForeignKey.new( columns, table_name, *args )
+      def add_foreign_key( columns, table_name, opts = {} )
+        add_column( opts[:type] || :integer, columns, opts ) unless columns.is_a? Array
+        @foreign_keys << ForeignKey.new( columns, table_name, opts )
       end
 
       # Add definition of column, index or foreign key.
@@ -580,7 +580,7 @@ module Miguel
       # we have to be careful to turn off the MySQL autoupdate behavior.
       # That's why we have to set defaults explicitly.
 
-      default_time = opts[ :mysql_timestamps ] ? ZERO_TIME : DEFAULT_TIME
+      default_time = ( opts[ :zero_timestamps ] || ( opts[ :mysql_timestamps ] && opts[ :zero_timestamps ].nil? ) ) ? ZERO_TIME : DEFAULT_TIME
       set_defaults :Time, :timestamp, :default => default_time
       set_defaults :Time?, :timestamp, :default => nil
 

data/lib/miguel/version.rb

@@ -2,7 +2,7 @@
 
 module Miguel
   MAJOR = 0
-  MINOR = 1
+  MINOR = 2
   PATCH = 0
   VERSION = [ MAJOR, MINOR, PATCH ].join( '.' ).freeze
 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
+  s.version     = Miguel::VERSION + '.pre1'
   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

@@ -76,6 +76,11 @@ Miguel::Schema.define( use_defaults: false ) do
     index :user_id
   end
 
+  table :bigint do
+    primary_key :id, type: :bigint
+    foreign_key :bigint_id, :bigint, type: :bigint
+  end if mysql
+
   table :reuse do
     primary_key :user_id
     foreign_key [:user_id], :users

data/test/helper.rb

@@ -6,18 +6,17 @@ def jruby?
   defined?( RUBY_ENGINE ) and RUBY_ENGINE == 'jruby'
 end
 
-if ENV[ 'COVERAGE' ]
-  require 'simplecov'
-  SimpleCov.start
-end
-
 begin
   require 'codeclimate-test-reporter'
-  CodeClimate::TestReporter.start
   ENV[ 'COVERAGE' ] = 'on'
 rescue LoadError
 end unless jruby?
 
+if ENV[ 'COVERAGE' ]
+  require 'simplecov'
+  SimpleCov.start
+end
+
 # Setup helpers.
 
 DATA_DIR = File.expand_path( "#{__FILE__}/../data" )
@@ -35,7 +34,7 @@ class Bacon::Context
   end
 
   def lines( s )
-    s.to_s.lines.map.with_index{ |l, i| "#{i}:#{l.strip}" }
+    s.to_s.lines.map.with_index{ |l, i| "#{i}:#{l.strip}" } << :EOF
   end
 
   def match( a, b )

data/test/test_importer.rb

@@ -15,6 +15,10 @@ describe Miguel::Importer do
         {},
         { unsigned_keys: true },
         { mysql_timestamps: true },
+        { mysql_timestamps: true, zero_timestamps: true },
+        { mysql_timestamps: true, zero_timestamps: false },
+        { zero_timestamps: true },
+        { zero_timestamps: false },
       ]
     when :postgres
       [ signed_unsigned: true ]

data/test/test_schema.rb

@@ -229,6 +229,65 @@ describe Miguel::Schema do
     end
   end
 
+  should 'control zero timestamps explicitly' do
+    match_schema <<-EOT, zero_timestamps: false do
+      table :timestamps do
+        timestamp :t1, :null => false, :default => "2000-01-01 00:00:00"
+        timestamp :t2, :null => true, :default => nil
+        timestamp :create_time, :null => false, :default => "2000-01-01 00:00:00"
+        timestamp :update_time, :null => false, :default => "2000-01-01 00:00:00"
+      end
+    EOT
+      table :timestamps do
+        Time :t1
+        Time? :t2
+        timestamps
+      end
+    end
+    match_schema <<-EOT, zero_timestamps: true do
+      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
+    EOT
+      table :timestamps do
+        Time :t1
+        Time? :t2
+        timestamps
+      end
+    end
+    match_schema <<-EOT, mysql_timestamps: true, zero_timestamps: true do
+      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 => Sequel.lit("CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
+      end
+    EOT
+      table :timestamps do
+        Time :t1
+        Time? :t2
+        timestamps
+      end
+    end
+    match_schema <<-EOT, mysql_timestamps: true, zero_timestamps: false do
+      table :timestamps do
+        timestamp :t1, :null => false, :default => "2000-01-01 00:00:00"
+        timestamp :t2, :null => true, :default => nil
+        timestamp :create_time, :null => false, :default => "2000-01-01 00:00:00"
+        timestamp :update_time, :null => false, :default => Sequel.lit("CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
+      end
+    EOT
+      table :timestamps do
+        Time :t1
+        Time? :t2
+        timestamps
+      end
+    end
+  end
+
   should 'support auto-incrementing primary keys' do
     match_schema <<-EOT do
       table :pk do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miguel
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0.pre1
 platform: ruby
 authors:
 - Patrik Rak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-06 00:00:00.000000000 Z
+date: 2019-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -146,9 +146,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5.1