declare_schema 0.13.1 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4caf19f1ddb0978b9e9bbc5c55d5941a934ded2e4bbd8adfba52c078e599106b
-  data.tar.gz: 2a8d9f9434f6acae5cab5bfe4ffc6eee0d6ce0e31a59b471d0c48b63b0c3260c
+  metadata.gz: e3a8974d1b6642065c32bf892d5b8eb2a7da63064bcc74a5b6f4982a21ac1771
+  data.tar.gz: d1cd0489a73e399b4ed21ec3e83c761d5edf821bcc1435d4f42e171700ccc27c
 SHA512:
-  metadata.gz: 6edfafddcd596afd63417d2e8f59aec7bfcd637e35d0fb77fc06f39e6e78d461da5c2e0b6752cb8b18785afa0ac81cfb7569fa0be85ba06ad3432d3911a624e5
-  data.tar.gz: 7d2d190f0c6928f7b70f96c8ce58517475ce1b512a31a7c33033314bff0405fb51d88c82c72bd0a8a1b25d8558039ef787b0314b60f7fdefbd75975c3320f57e
+  metadata.gz: 8926952cc9aec61b28cc9fe74d5766d3c67f35734b9bec4d93a767e58966a48bccc8bd49b919f9699c9d0e386f0ae2b9d43ffa65fec764959e6389b3daf92496
+  data.tar.gz: 9149635173ede506625904d2ffa6aa4864c7dae69c0edf1dba776a60c5a46e77c95ccbb711d8db6c2aef63e4f38ae58e795686bbcce1574fc1ace064077eb593

data/CHANGELOG.md

@@ -4,6 +4,10 @@ Inspired by [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 Note: this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.13.2] - 2021-08-04
+### Fixed
+- Fixed issue with disable_auto_increment support for new tables.
+
 ## [0.13.1] - 2021-08-02
 ### Fixed
 - Fixed migration file indentation bug in Rails 5 where the first line was indented an extra 4 characters.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    declare_schema (0.13.1)
+    declare_schema (0.13.2)
       rails (>= 4.2)
 
 GEM

data/lib/declare_schema/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DeclareSchema
-  VERSION = "0.13.1"
+  VERSION = "0.13.2"
 end

data/lib/generators/declare_schema/migration/migrator.rb

@@ -226,7 +226,9 @@ module Generators
 
             primary_key_definition =
               if disable_auto_increment
-                [:integer, :id, limit: 8, auto_increment: false, primary_key: true]
+                [[:integer, :id, limit: 8, auto_increment: false, primary_key: true]]
+              else
+                []
               end
 
             field_definitions = model.field_specs.values.sort_by(&:position).map do |f|
@@ -237,7 +239,7 @@ module Generators
             table_options = create_table_options(model, disable_auto_increment)
 
             table_add = ::DeclareSchema::SchemaChange::TableAdd.new(t,
-                                                                    Array(primary_key_definition) + field_definitions,
+                                                                    primary_key_definition + field_definitions,
                                                                     table_options,
                                                                     sql_options: table_options_definition.settings)
             [

data/spec/lib/declare_schema/migration_generator_spec.rb

@@ -803,9 +803,34 @@ RSpec.describe 'DeclareSchema Migration Generator' do
         EOS
       )
 
+      Advert.connection.schema_cache.clear!
+      Advert.reset_column_information
+
       nuke_model_class(Advert)
       ActiveRecord::Base.connection.execute("drop table `adverts`;")
 
+      class Advert < ActiveRecord::Base
+        def self.disable_auto_increment
+          true
+        end
+
+        fields do
+          description :text, limit: 250, null: true
+        end
+      end
+
+      up, _ = Generators::DeclareSchema::Migration::Migrator.run.tap do |migrations|
+        expect(migrations).to(
+          migrate_up(<<~EOS.strip)
+            create_table :adverts, id: false do |t|
+              t.integer :id, limit: 8, auto_increment: false, primary_key: true
+              t.text    :description, limit: nil, null: true
+            end
+          EOS
+            .and migrate_down("drop_table :adverts")
+        )
+      end
+
       ## DSL
 
       # The DSL allows lambdas and constants

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: declare_schema
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.13.2
 platform: ruby
 authors:
 - Invoca Development adapted from hobo_fields by Tom Locke
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-02 00:00:00.000000000 Z
+date: 2021-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -128,7 +128,7 @@ homepage: https://github.com/Invoca/declare_schema
 licenses: []
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Database schema declaration and migration generator for Rails
 test_files: []