miguel 0.1.0.pre7 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c9d433cde1f5c11fbaa6f05447d646c48164a9ae
-  data.tar.gz: fc5cdeef2a2ddd96b23fdc815dbfd4e7befd91d8
+SHA256:
+  metadata.gz: a2c18dba8459d1bdfe249763d04a4d423ff3a68c647552e3a1930d4a558820b7
+  data.tar.gz: 2cc0ca7730fd4ce526ccc2b96f59effc2ab78611d9c45392bee4cb3565c8d883
 SHA512:
-  metadata.gz: e3f618e52170198078448a50a0fb7673958a5ed3ef7e01eb42226035008e7219d61e5851d7c4b7ceed82bb5e0c878ca95c6cc5b813fbf09684af94e28eaaacb7
-  data.tar.gz: dd7b64ea4f90f82af8112405a268690311f2ad6d82fce7beab3c7c042394dbf1d0d482c91c8e24b9c12a493e22c3d72f4cb70248158c31adb9d914295486b337
+  metadata.gz: 9c64bf876100abd4bad1dd05e0aebd5f4040c497bbff4afce009d60018d52f6238e896d64aac813ccb46aff6b47e82179d77708be775bfca1d80a9eca06e71a6
+  data.tar.gz: abcabe36a6bcb93742611ccd3410702af25850fe49862a70e8e6e8098d545dd195c501d547d322b4a118527c65897669018bd03fbfd61f8bd99ec6920e8e3c48

data/.gitignore

@@ -1,3 +1,7 @@
 *~
+Gemfile.lock
 /miguel-*.gem
+/bundler
 /coverage
+/doc
+/.yardoc

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/.yardopts

@@ -0,0 +1,3 @@
+--markup-provider redcarpet
+--markup markdown
+- README.md LICENSE

data/Gemfile

@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gemspec

data/LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2015 Patrik Rak (patrik@raxoft.cz)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

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/Rakefile

@@ -1,5 +1,7 @@
 # Rake makefile.
 
+require 'rake/testtask'
+
 task :default => :test
 
 desc 'Run tests'
@@ -7,4 +9,11 @@ task :test do
   sh "bacon --automatic --quiet"
 end
 
+desc 'Run tests with coverage'
+task :cov do
+  sh "rm -rf coverage"
+  ENV['COVERAGE'] = 'on'
+  Rake::Task[:test].execute
+end
+
 # EOF #

data/lib/miguel/command.rb

@@ -102,36 +102,48 @@ module Miguel
     # Execute the command itself.
     def execute( args )
       command = args.shift or fail "Missing command, use -h to see usage."
-      case command
-      when 'show'
-        check_args( args, 1 )
-        schema = get_schema( args.shift )
-        print schema.dump
-      when 'dump'
-        check_args( args, 1 )
-        schema = get_schema( args.shift )
-        show_changes( Schema.new, schema )
-      when 'down'
-        check_args( args, 1 )
-        schema = get_schema( args.shift )
-        show_changes( schema, Schema.new )
-      when 'diff'
-        check_args( args, 2 )
-        old_schema = get_schema( args.shift )
-        new_schema = get_schema( args.shift )
-        show_changes( old_schema, new_schema )
-      when 'apply'
-        check_args( args, 2 )
-        db = get_db( args.shift )
-        schema = get_schema( args.shift )
-        apply_schema( db, schema )
-      when 'clear'
-        check_args( args, 1 )
-        db = get_db( args.shift )
-        apply_schema( db, Schema.new )
-      else
-        fail "Invalid command, use -h to see usage."
-      end
+      method = "execute_#{command}"
+      fail "Invalid command, use -h to see usage." unless respond_to?( method, true )
+      check_args( args, method( method ).arity )
+      send( method, *args )
+    end
+
+    # Execute the show command.
+    def execute_show( name )
+      schema = get_schema( name )
+      print schema.dump
+    end
+
+    # Execute the dump command.
+    def execute_dump( name )
+      schema = get_schema( name )
+      show_changes( Schema.new, schema )
+    end
+
+    # Execute the down command.
+    def execute_down( name )
+      schema = get_schema( name )
+      show_changes( schema, Schema.new )
+    end
+
+    # Execute the diff command.
+    def execute_diff( old_name, new_name )
+      old_schema = get_schema( old_name )
+      new_schema = get_schema( new_name )
+      show_changes( old_schema, new_schema )
+    end
+
+    # Execute the apply command.
+    def execute_apply( db_name, name )
+      db = get_db( db_name )
+      schema = get_schema( name )
+      apply_schema( db, schema )
+    end
+
+    # Execute the clear command.
+    def execute_clear( db_name )
+      db = get_db( db_name )
+      apply_schema( db, Schema.new )
     end
 
     # Make sure the argument count is as expected.

data/lib/miguel/importer.rb

@@ -36,46 +36,50 @@ module Miguel
       end
     end
 
-    # Convert given database type to type and optional options used by our schema definitions.
-    # The ruby type provided serves as a hint of what Sequel's idea of the type is.
-    def revert_type_literal_internal( type, ruby_type )
+    # Convert given MySQL database type to type and optional options used by our schema definitions.
+    def revert_mysql_type( type )
+      case type
+      when /\Aint\(\d+\)\z/
+        return :integer, :default_size => 11
+      when /\Aint\(\d+\) unsigned\z/
+        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/
+        return $1.to_sym, :elements => parse_elements( $2 )
+      end
+    end
 
-      return :boolean, :default_size => 1 if ruby_type == :boolean
+    # Convert given SQLite database type to type and optional options used by our schema definitions.
+    def revert_sqlite_type( type )
+      case type
+      when /\Ainteger UNSIGNED\z/
+        return :integer, :unsigned => true
+      end
+    end
 
-      case db.database_type
-      when :mysql
-        case type
-        when /\Aint\(\d+\)\z/
-          return :integer, :default_size => 11
-        when /\Aint\(\d+\) unsigned\z/
-          return :integer, :unsigned => true, :default_size => 10
-        when /\Abigint\(\d+\)\z/
-          return :bigint, :default_size => 20
-        when /\Adecimal\(\d+,\d+\)\z/
-          return :decimal, :default_size => [ 10, 0 ]
-        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
-      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
+    # Convert given Postgres database type to type and optional options used by our schema definitions.
+    def revert_postgres_type( type )
+      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
 
+    # Convert given generic database type to type and optional options used by our schema definitions.
+    def revert_generic_type( type )
       case type
       when /\Avarchar/
         return :String, :default_size => 255
@@ -88,8 +92,17 @@ module Miguel
       when /\A\w+\z/
         return type.to_sym
       end
+    end
+
+    # Convert given database type to type and optional options used by our schema definitions.
+    # The ruby type provided serves as a hint of what Sequel's idea of the type is.
+    def revert_type_literal_internal( type, ruby_type )
+      return :boolean, :default_size => 1 if ruby_type == :boolean
+
+      method = "revert_#{db.database_type}_type"
+      specific_type = send( method, type ) if respond_to?( method, true )
 
-      ruby_type
+      specific_type || revert_generic_type( type ) || ruby_type
     end
 
     # Convert given database type to type and optional options used by our schema definitions.

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 + '.pre7'
+  s.version     = Miguel::VERSION
   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
@@ -21,7 +21,9 @@ EOT
 
   s.required_ruby_version = '>= 1.9.3'
   s.add_runtime_dependency 'sequel', '~> 4.27'
+  s.add_development_dependency 'rake', '~> 13.0'
   s.add_development_dependency 'bacon', '~> 1.2'
+  s.add_development_dependency 'simplecov', '~> 0.21'
   s.add_development_dependency 'sqlite3'
   s.add_development_dependency 'mysql2'
   s.add_development_dependency 'pg'

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,19 @@ 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 do
+    add_filter 'bundler'
+  end
+end
+
 # Setup helpers.
 
 DATA_DIR = File.expand_path( "#{__FILE__}/../data" )
@@ -35,7 +36,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.pre7
+  version: 0.2.0
 platform: ruby
 authors:
 - Patrik Rak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-06 00:00:00.000000000 Z
+date: 2022-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.27'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: bacon
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.21'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.21'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -92,6 +120,9 @@ files:
 - ".gitignore"
 - ".travis.gemfile"
 - ".travis.yml"
+- ".yardopts"
+- Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - bin/miguel
@@ -144,12 +175,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Database migrator and migration generator for Sequel.