ridgepole 0.8.12 → 0.8.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91c51bf51596b61eff43704847bd41b9f8035ceafd1f1e05e1cd72fc6632e582
-  data.tar.gz: 32aff893209c48b839286b7efe24d465e3dd808d3b8820f52a5fb4eb9ecbf606
+  metadata.gz: 4c68b630030e34fb6e399e053d7d5c43245487c81d0869f9783b05e1135b5e2e
+  data.tar.gz: b7061e1c9c0bdf8e7509ab3601e397031edd2d9397975b178bac12ddb669c413
 SHA512:
-  metadata.gz: 92c24eca95293b83ab73871c9baaff349e8d28be8ddc5583746d3beecf0b6986eb58127361654fc0742c95b68f9ac2c060ca689af98a9ca6558b78c960b2a35b
-  data.tar.gz: 6864c16bbd8723436219540b7a3ab0f5eccfb32ae5301ac827957b9671c8cf83d7a91ea13a9a364f3b94ef236d2b3334742adce0524f7cb22801d298757cb0cd
+  metadata.gz: 8bbfcabaad944ad5ed18c5b809e06243582c9f3977890e499c2b400af7f268206876174d0cd3b6184e67b33ef67d5bd6226b63c88c13d820c9ed4fab5f5bdbdc
+  data.tar.gz: 7ed62d44a593d40b8c3d8b91b6d0ea7c10ae99337789db4ffbdffc9bf43cfb6b2e2fc81959cca1e823a9adf40968717d264f965aa4edb4e591bed55cff3c7c9d

data/README.md

@@ -127,6 +127,8 @@ It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.
   * Support t.reference() foreign_key option ([pull#316](https://github.com/winebarrel/ridgepole/pull/316))
 * `>= 0.8.12`
   * Pluralize column specified by `references` ([pull#317](https://github.com/winebarrel/ridgepole/pull/317))
+* `>= 0.8.13`
+  * Support `serial` and `bigserial` column types  ([pull#321](https://github.com/winebarrel/ridgepole/pull/321))
 </details>
 
 ## Installation

data/lib/ridgepole/default_limit.rb

@@ -23,7 +23,7 @@ module Ridgepole
       end
 
       def adapter
-        ActiveRecord::Base.connection_config.fetch(:adapter).to_sym
+        ActiveRecord::Base.connection.adapter_name.downcase.to_sym
       rescue ActiveRecord::ConnectionNotEstablished
         nil
       end

data/lib/ridgepole/dsl_parser/table_definition.rb

@@ -22,57 +22,60 @@ module Ridgepole
 
       DEFAULT_PRIMARY_KEY_TYPE = Gem::Version.new(ActiveRecord::VERSION::STRING) >= Gem::Version.new('5.1') ? :bigint : :integer
 
-      TYPES = [
+      TYPES = {
         # https://github.com/rails/rails/blob/v4.2.1/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb#L274
-        :string,
-        :text,
-        :integer,
-        :bigint,
-        :float,
-        :decimal,
-        :datetime,
-        :timestamp,
-        :time,
-        :date,
-        :binary,
-        :boolean,
+        string: {},
+        text: {},
+        integer: {},
+        bigint: {},
+        float: {},
+        decimal: {},
+        datetime: {},
+        timestamp: {},
+        time: {},
+        date: {},
+        binary: {},
+        boolean: {},
 
         # https://github.com/rails/rails/blob/v4.2.1/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb#L79
-        :daterange,
-        :numrange,
-        :tsrange,
-        :tstzrange,
-        :int4range,
-        :int8range,
-        :binary,
-        :boolean,
-        :bigint,
-        :xml,
-        :tsvector,
-        :hstore,
-        :inet,
-        :cidr,
-        :macaddr,
-        :uuid,
-        :json,
-        :jsonb,
-        :ltree,
-        :citext,
-        :point,
-        :bit,
-        :bit_varying,
-        :money,
+        serial: { null: false },
+        bigserial: { null: false },
+        daterange: {},
+        numrange: {},
+        tsrange: {},
+        tstzrange: {},
+        int4range: {},
+        int8range: {},
+        # binary: {}, # dup key
+        # boolean: {}, # dup key
+        # bigint: {}, # dup key
+        xml: {},
+        tsvector: {},
+        hstore: {},
+        inet: {},
+        cidr: {},
+        macaddr: {},
+        uuid: {},
+        json: {},
+        jsonb: {},
+        ltree: {},
+        citext: {},
+        point: {},
+        bit: {},
+        bit_varying: {},
+        money: {},
 
         # https://github.com/rails/rails/blob/v5.1.1/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb#L184
-        :virtual,
+        virtual: {},
 
         # https://github.com/rails/rails/blob/v5.0.4/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb#L53
-        :json
-      ].uniq
+        # json: {}, # dup key
+      }.freeze
 
-      TYPES.each do |column_type|
+      TYPES.each do |column_type, default_options|
         define_method column_type do |*args|
           options = args.extract_options!
+          options = default_options.merge(options)
           column_names = args
           column_names.each { |name| column(name, column_type, options) }
         end

data/lib/ridgepole/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ridgepole
-  VERSION = '0.8.12'
+  VERSION = '0.8.13'
 end

data/ridgepole.gemspec

@@ -36,5 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '>= 3.0.0'
   spec.add_development_dependency 'rspec-match_fuzzy', '>= 0.1.3'
   spec.add_development_dependency 'rspec-match_ruby', '>= 0.1.3'
-  spec.add_development_dependency 'rubocop', '>= 0.57.1'
+  spec.add_development_dependency 'rubocop', '>= 1.7.0'
+  spec.add_development_dependency 'rubocop-rake', '>= 0.5.1'
+  spec.add_development_dependency 'rubocop-rspec', '>= 2.1.0'
 end

data/spec/postgresql/migrate/migrate_add_column_spec.rb

@@ -116,10 +116,12 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         create_table "titles", id: false, force: :cascade do |t|
-          t.integer "emp_no", null: false
-          t.string  "title", limit: 50, null: false
-          t.date    "from_date", null: false
-          t.date    "to_date"
+          t.integer   "emp_no", null: false
+          t.string    "title", limit: 50, null: false
+          t.date      "from_date", null: false
+          t.date      "to_date"
+          t.serial    "title_no", null: false
+          t.bigserial "title_bigno", null: false
           t.index ["emp_no"], name: "idx_titles_emp_no", <%= i cond(5.0, using: :btree) %>
         end
       ERB
@@ -149,6 +151,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.column("age", :integer, **{:null=>false})
           t.column("updated_at", :date, **{})
         end
+
+        change_table("titles", bulk: true) do |t|
+          t.column("title_no", :serial, **{:null=>false})
+          t.column("title_bigno", :bigserial, **{:null=>false})
+        end
       RUBY
       delta.migrate
       expect(subject.dump).to match_ruby expected_dsl

data/spec/postgresql/migrate/migrate_change_column_spec.rb

@@ -157,6 +157,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
         create_table "clubs", force: :cascade do |t|
           t.string "name", default: "", null: false
           t.text "desc"
+          t.serial "club_no"
+          t.bigserial "club_bigno"
         end
       ERB
     end
@@ -166,6 +168,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
         create_table "clubs", force: :cascade do |t|
           t.string "name", default: "", null: false
           t.text "desc"
+          t.serial "club_no"
+          t.bigserial "club_bigno"
         end
       ERB
     end

data/spec/postgresql/migrate/migrate_drop_column_spec.rb

@@ -54,10 +54,12 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         create_table "titles", id: false, force: :cascade do |t|
-          t.integer "emp_no", null: false
-          t.string  "title", limit: 50, null: false
-          t.date    "from_date", null: false
-          t.date    "to_date"
+          t.integer   "emp_no", null: false
+          t.string    "title", limit: 50, null: false
+          t.date      "from_date", null: false
+          t.date      "to_date"
+          t.serial    "title_no", null: false
+          t.bigserial "title_bigno", null: false
           t.index ["emp_no"], name: "idx_titles_emp_no", <%= i cond(5.0, using: :btree) %>
         end
       ERB
@@ -148,6 +150,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.remove("last_name")
           t.remove("hire_date")
         end
+
+        change_table("titles", bulk: true) do |t|
+          t.remove("title_no")
+          t.remove("title_bigno")
+        end
       RUBY
       delta.migrate
       expect(subject.dump).to match_ruby expected_dsl

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.8.12
+  version: 0.8.13
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-04 00:00:00.000000000 Z
+date: 2021-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -218,14 +218,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.57.1
+        version: 1.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.57.1
+        version: 1.7.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 description: Ridgepole is a tool to manage DB schema. It defines DB schema using Rails
   DSL, and updates DB schema according to DSL.
 email: