declare_schema 1.2.0.pre.1 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e34615eda56bac536ac728a8edcddcec4cad606257a3fbb0769024a1837f0dc
-  data.tar.gz: e54fb15d2400b5edf651678d4249b75cbeb014cfe4faa4fbfe6558f19af97e45
+  metadata.gz: 9ba6099c2cfd605309415e3a14d53ba36aecad45285c4babdc385fa3576225ff
+  data.tar.gz: 60c009064977df314115e0bd1db8e811ba05866e24ac652a31b3ec4bc25291f5
 SHA512:
-  metadata.gz: 67cef61d9e6dc3bcdc4d1b8f39cf3f4abf43917df38ec5b0f1503f0c275ae94d27501fd10a654eff5ee4ca4c4105bebc1db7031c77112b562a55be8127269893
-  data.tar.gz: c511dc4230e52796249f9f5e260ccdef4c21b963b5564236ee2e601366efcc6823470711bc1116947cf9fe97f6ac1a0ec9d9341eee4fa713192be97aece7c762
+  metadata.gz: 9a7308b18a3a38c4713a2effb7f7f9dcf6b75702703152292061d4e266ada35b7be47e4ab43322965f9bfb0c88886ee138bea984bf0e09a9d37dde8bd1fe2da5
+  data.tar.gz: 10c67731046059b1ae1ff483ae979f4b649805deac4559ae2e4533082fa4e4a66e237814ff5873c638543ed533a5f660bf1dd204a5e3a8356fe377da1769d388

data/CHANGELOG.md

@@ -4,11 +4,19 @@ 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).
 
-## [1.2.0] - Unreleased
+## [1.2.1] - 2022-09-25
+### Fixed
+- If Rails is defined, raise if `Rails.application` is `nil`.
+
+## [1.2.0] - 2022-09-14
 ### Added
 - Added a rake task definition that can be optionally included into a non-Rails project to generate
   schema migrations.
 
+### Fixed
+- Fixed a bug where not aliasing column names was allowing mysql to return them using their uppercase
+  variants
+
 ## [1.1.0] - 2022-07-22
 ### Changed
 - Fixed a bug where `DeclareSchema::Model::HabtmModelShim` `indexes` and `integer limits` were not being generated properly. Use `limit 8` for ids and primary composite key for habtm model.
@@ -234,6 +242,7 @@ using the appropriate Rails configuration attributes.
 ### Added
 - Initial version from https://github.com/Invoca/hobo_fields v4.1.0.
 
+[1.2.1]: https://github.com/Invoca/declare_schema/compare/v1.2.0...v1.2.1
 [1.2.0]: https://github.com/Invoca/declare_schema/compare/v1.1.0...v1.2.0
 [1.1.0]: https://github.com/Invoca/declare_schema/compare/v1.0.2...v1.1.0
 [1.0.2]: https://github.com/Invoca/declare_schema/compare/v1.0.1...v1.0.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    declare_schema (1.2.0.pre.1)
+    declare_schema (1.2.1)
       rails (>= 5.0)
 
 GEM

data/README.md

@@ -1,6 +1,6 @@
 # DeclareSchema
 
-Declare your Rails/active_record model schemas and have database migrations generated for you!
+Declare your Rails/ActiveRecord model schemas and have database migrations generated for you!
 
 ## Example
 
@@ -60,6 +60,20 @@ declare_schema id: :bigint do
 end
 ```
 
+## Usage without Rails
+
+When using `DeclareSchema` without Rails, you can use the `declare_schema/rake` task to generate the migration file.
+
+To do so, add the following require to your Rakefile:
+```ruby
+require 'declare_schema/rake'
+```
+
+Then, run the task:
+```sh
+rake declare_schema:generate
+```
+
 ## Migrator Configuration
 
 The following configuration options are available for the gem and can be used
@@ -117,7 +131,7 @@ declaration.
 
 For example, adding the following to your `config/initializers` directory will
 set the default `text limit` value to `0xffff`:
- 
+
 **declare_schema.rb**
 ```ruby
 # frozen_string_literal: true
@@ -133,7 +147,7 @@ declaration.
 
 For example, adding the following to your `config/initializers` directory will
 set the default `string limit` value to `255`:
- 
+
 **declare_schema.rb**
 ```ruby
 # frozen_string_literal: true
@@ -149,7 +163,7 @@ declaration.
 
 For example, adding the following to your `config/initializers` directory will
 set the default `null` value to `true`:
- 
+
 **declare_schema.rb**
 ```ruby
 # frozen_string_literal: true
@@ -163,7 +177,7 @@ This value defaults to `true` and can only be set at the global level.
 
 For example, adding the following to your `config/initializers` directory will set
 the default `generate foreign keys` value to `false`:
- 
+
 **declare_schema.rb**
 ```ruby
 # frozen_string_literal: true
@@ -177,7 +191,7 @@ This value defaults to `true` and can only be set at the global level.
 
 For example, adding the following to your `config/initializers` directory will
 set the default `generate indexing` value to `false`:
- 
+
 **declare_schema.rb**
 ```ruby
 # frozen_string_literal: true

data/lib/declare_schema/model/column.rb

@@ -132,7 +132,7 @@ module DeclareSchema
         database_name = connection.current_database
 
         defaults = connection.select_one(<<~EOS)
-          SELECT C.character_set_name, C.collation_name
+          SELECT C.character_set_name as character_set_name, C.collation_name as collation_name
           FROM information_schema.`COLUMNS` C
           WHERE C.table_schema = '#{connection.quote_string(database_name)}' AND
                 C.table_name = '#{connection.quote_string(current_table_name)}' AND

data/lib/declare_schema/model/table_options_definition.rb

@@ -27,7 +27,7 @@ module DeclareSchema
         def mysql_table_options(connection, table_name)
           database = connection.current_database
           defaults = connection.select_one(<<~EOS) or raise "no defaults found for table #{table_name}"
-            SELECT CCSA.character_set_name, CCSA.collation_name
+            SELECT CCSA.character_set_name as character_set_name, CCSA.collation_name as collation_name
             FROM information_schema.TABLES as T
               JOIN information_schema.COLLATION_CHARACTER_SET_APPLICABILITY as CCSA
                 ON CCSA.collation_name = T.table_collation

data/lib/declare_schema/rake.rb

@@ -6,6 +6,10 @@ require "declare_schema/schema_change/column_remove"
 require "generators/declare_schema/migration/migrator"
 require "erb"
 
+# This is a set of Rake tasks that can be used to generate migrations when using
+# ActiveRecord, but not within a Rails application. If using Rails, you should
+# use the built-in generators that come with the gem instead.
+
 namespace :declare_schema do
   desc 'Generate migrations for the database schema'
   task :generate => 'db:load_config' do
@@ -24,29 +28,15 @@ namespace :declare_schema do
     puts down
     puts "----------------------------------"
 
-    final_migration_name = default_migration_name
-    migration_template   = ERB.new(<<~EOF.chomp)
-      # frozen_string_literal: true
-      class <%= @migration_class_name %> < (ActiveRecord::Migration[4.2])
-        def self.up
-      <%= @up.presence or raise "no @up given!" %>
-        end
-        def self.down
-      <%= @down.presence or raise "no @down given!" %>
-        end
-      end
-    EOF
+    migration_root_directory = "db/migrate"
+
+    final_migration_name = Generators::DeclareSchema::Migration::Migrator.default_migration_name(Dir["#{migration_root_directory}/*declare_schema_migration*"])
+    migration_template   = ERB.new(File.read(File.expand_path("../generators/declare_schema/migration/templates/migration.rb.erb", __dir__)))
 
     @up = "    #{up.strip.split("\n").join("\n    ")}"
     @down = "    #{down.strip.split("\n").join("\n    ")}"
     @migration_class_name = final_migration_name.camelize
 
-    File.write("db/migrate/#{Time.now.to_i}_#{final_migration_name.underscore}.rb", migration_template.result(binding))
+    File.write("#{migration_root_directory}/#{Time.now.to_i}_#{final_migration_name.underscore}.rb", migration_template.result(binding))
   end
 end
-
-def default_migration_name
-  existing = Dir["db/migrate/*declare_schema_migration*"]
-  max = existing.grep(/([0-9]+)\.rb$/) { Regexp.last_match(1).to_i }.max.to_i
-  "declare_schema_migration_#{max + 1}"
-end

data/lib/declare_schema/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DeclareSchema
-  VERSION = "1.2.0.pre.1"
+  VERSION = "1.2.1"
 end

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

@@ -28,9 +28,8 @@ module Generators
             Migrator.new(renames: renames).generate
           end
 
-          def default_migration_name
-            existing = Dir["#{Rails.root}/db/migrate/*declare_schema_migration*"]
-            max = existing.grep(/([0-9]+)\.rb$/) { Regexp.last_match(1).to_i }.max.to_i
+          def default_migration_name(existing_migrations = Dir["#{Rails.root}/db/migrate/*declare_schema_migration*"])
+            max = existing_migrations.grep(/([0-9]+)\.rb$/) { Regexp.last_match(1).to_i }.max.to_i
             "declare_schema_migration_#{max + 1}"
           end
 
@@ -56,6 +55,7 @@ module Generators
         def load_rails_models
           ActiveRecord::Migration.verbose = false
           if defined?(Rails)
+            Rails.application or raise "Rails is defined, so Rails.application must be set"
             Rails.application.eager_load!
             Rails::Engine.subclasses.each(&:eager_load!)
           end

data/lib/generators/declare_schema/migration/templates/migration.rb.erb

@@ -1,4 +1,4 @@
-class <%= @migration_class_name %> < (ActiveRecord::Migration[4.2])
+class <%= @migration_class_name %> < ActiveRecord::Migration[4.2]
   def self.up
 <%= @up.presence or raise "no @up given!" %>
   end

data/spec/lib/declare_schema/migration_generator_spec.rb

@@ -1287,7 +1287,7 @@ RSpec.describe 'DeclareSchema Migration Generator' do
         migration_content = File.read(migrations.first)
         first_line = migration_content.split("\n").first
         base_class = first_line.split(' < ').last
-        expect(base_class).to eq("(ActiveRecord::Migration[4.2])")
+        expect(base_class).to eq("ActiveRecord::Migration[4.2]")
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: declare_schema
 version: !ruby/object:Gem::Version
-  version: 1.2.0.pre.1
+  version: 1.2.1
 platform: ruby
 authors:
 - Invoca Development adapted from hobo_fields by Tom Locke
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-13 00:00:00.000000000 Z
+date: 2022-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -127,7 +127,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
@@ -143,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubygems_version: 3.1.6
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Database schema declaration and migration generator for Rails
 test_files: []