sequelize-rails 0.5.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffb36f44727f56d3d9f157d95b669785999567afc37d7b2b4a1c99e4b7fbfe40
-  data.tar.gz: f2f9b2e5b1a96a8048731ab03cbc279fb363f1549da47f988869dc9d55d34989
+  metadata.gz: ed358e5bb7080bb8fe4c713a46b295cb7cd1c51de02cda2b6daf0580e2ae42be
+  data.tar.gz: 8382be25407a695811c735ca4bf93e4eddf709cc86bb9d501b948f2bfb090ec2
 SHA512:
-  metadata.gz: 33451f66a4c01399910e6ec4bfdbed2a9136f1da5fe537020efae31a39e1cbdc514da3f7f0773888cf16bd4e5a1648ef57d76170fd3ee76aa006e27fde85485a
-  data.tar.gz: 692a29096179817f411539a22363cf4a8688bdf688236fa9c5ecee2b8644c0a72d78939be12db570ff6a5faa7a9d620fd90415b5ea075a2107d283f85f4f06de
+  metadata.gz: f940cf5b229febd629e5a06ecf9d7c69cfb5a6e0ca36ede15bdcbebd3e836ea919b83eb8d20e9658d2a4339d26e3663684aab0781c20657a564a99d4ad9935e1
+  data.tar.gz: b9fea39afcb85fe6bfd7659e470f676b1df28e49355a90598f9e3a10fdf4011686c7d200f8e73790282a9de09839d92dc8afd95f75684090db168345eaa3d348

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## [Unreleased]
 
+## [0.6.1] - 2023-09-04
+
+- Migrations now generate SQL files by default
+
+## [0.6.0] - 2023-09-04
+
+- Adds migration generator
+
 ## [0.5.0] - 2023-09-04
 
 - Adds the `db:seed` rake task for running seed files

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sequelize-rails (0.5.0)
+    sequelize-rails (0.6.1)
       activerecord (>= 6.0.0)
       rails (>= 6.0.0)
       sequel (>= 5.0.0)
@@ -9,67 +9,67 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.0.7)
-      actionpack (= 7.0.7)
-      activesupport (= 7.0.7)
+    actioncable (7.0.7.2)
+      actionpack (= 7.0.7.2)
+      activesupport (= 7.0.7.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.7)
-      actionpack (= 7.0.7)
-      activejob (= 7.0.7)
-      activerecord (= 7.0.7)
-      activestorage (= 7.0.7)
-      activesupport (= 7.0.7)
+    actionmailbox (7.0.7.2)
+      actionpack (= 7.0.7.2)
+      activejob (= 7.0.7.2)
+      activerecord (= 7.0.7.2)
+      activestorage (= 7.0.7.2)
+      activesupport (= 7.0.7.2)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.0.7)
-      actionpack (= 7.0.7)
-      actionview (= 7.0.7)
-      activejob (= 7.0.7)
-      activesupport (= 7.0.7)
+    actionmailer (7.0.7.2)
+      actionpack (= 7.0.7.2)
+      actionview (= 7.0.7.2)
+      activejob (= 7.0.7.2)
+      activesupport (= 7.0.7.2)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (7.0.7)
-      actionview (= 7.0.7)
-      activesupport (= 7.0.7)
+    actionpack (7.0.7.2)
+      actionview (= 7.0.7.2)
+      activesupport (= 7.0.7.2)
       rack (~> 2.0, >= 2.2.4)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (7.0.7)
-      actionpack (= 7.0.7)
-      activerecord (= 7.0.7)
-      activestorage (= 7.0.7)
-      activesupport (= 7.0.7)
+    actiontext (7.0.7.2)
+      actionpack (= 7.0.7.2)
+      activerecord (= 7.0.7.2)
+      activestorage (= 7.0.7.2)
+      activesupport (= 7.0.7.2)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.0.7)
-      activesupport (= 7.0.7)
+    actionview (7.0.7.2)
+      activesupport (= 7.0.7.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (7.0.7)
-      activesupport (= 7.0.7)
+    activejob (7.0.7.2)
+      activesupport (= 7.0.7.2)
       globalid (>= 0.3.6)
-    activemodel (7.0.7)
-      activesupport (= 7.0.7)
-    activerecord (7.0.7)
-      activemodel (= 7.0.7)
-      activesupport (= 7.0.7)
-    activestorage (7.0.7)
-      actionpack (= 7.0.7)
-      activejob (= 7.0.7)
-      activerecord (= 7.0.7)
-      activesupport (= 7.0.7)
+    activemodel (7.0.7.2)
+      activesupport (= 7.0.7.2)
+    activerecord (7.0.7.2)
+      activemodel (= 7.0.7.2)
+      activesupport (= 7.0.7.2)
+    activestorage (7.0.7.2)
+      actionpack (= 7.0.7.2)
+      activejob (= 7.0.7.2)
+      activerecord (= 7.0.7.2)
+      activesupport (= 7.0.7.2)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (7.0.7)
+    activesupport (7.0.7.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -80,14 +80,15 @@ GEM
       rake
       thor (>= 0.14.0)
     ast (2.4.2)
+    bigdecimal (3.1.4)
     builder (3.2.4)
     coderay (1.1.3)
     concurrent-ruby (1.2.2)
     crass (1.0.6)
     date (3.3.3)
     erubi (1.12.0)
-    globalid (1.1.0)
-      activesupport (>= 5.0)
+    globalid (1.2.0)
+      activesupport (>= 6.1)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     json (2.6.3)
@@ -133,20 +134,20 @@ GEM
     rack (2.2.8)
     rack-test (2.1.0)
       rack (>= 1.3)
-    rails (7.0.7)
-      actioncable (= 7.0.7)
-      actionmailbox (= 7.0.7)
-      actionmailer (= 7.0.7)
-      actionpack (= 7.0.7)
-      actiontext (= 7.0.7)
-      actionview (= 7.0.7)
-      activejob (= 7.0.7)
-      activemodel (= 7.0.7)
-      activerecord (= 7.0.7)
-      activestorage (= 7.0.7)
-      activesupport (= 7.0.7)
+    rails (7.0.7.2)
+      actioncable (= 7.0.7.2)
+      actionmailbox (= 7.0.7.2)
+      actionmailer (= 7.0.7.2)
+      actionpack (= 7.0.7.2)
+      actiontext (= 7.0.7.2)
+      actionview (= 7.0.7.2)
+      activejob (= 7.0.7.2)
+      activemodel (= 7.0.7.2)
+      activerecord (= 7.0.7.2)
+      activestorage (= 7.0.7.2)
+      activesupport (= 7.0.7.2)
       bundler (>= 1.15.0)
-      railties (= 7.0.7)
+      railties (= 7.0.7.2)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
@@ -154,9 +155,9 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    railties (7.0.7)
-      actionpack (= 7.0.7)
-      activesupport (= 7.0.7)
+    railties (7.0.7.2)
+      actionpack (= 7.0.7.2)
+      activesupport (= 7.0.7.2)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
@@ -181,7 +182,8 @@ GEM
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     ruby-progressbar (1.13.0)
-    sequel (5.71.0)
+    sequel (5.72.0)
+      bigdecimal
     sqlite3 (1.6.1)
       mini_portile2 (~> 2.8.0)
     standard (1.25.3)

data/lib/sequel/generators/application_record_generator.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Sequel
+  module Generators
+    class ApplicationRecordGenerator < ::Rails::Generators::Base
+      source_root File.expand_path("templates", __dir__)
+
+      def create_application_record
+        template "application_record.rb", application_record_file_name
+      end
+
+      private
+
+      def application_record_file_name
+        @application_record_file_name ||=
+          if namespaced?
+            "app/models/#{namespaced_path}/application_record.rb"
+          else
+            "app/models/application_record.rb"
+          end
+      end
+    end
+  end
+end

data/lib/sequel/generators/migration_generator.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Sequel
+  module Generators
+    class MigrationGenerator < ::Rails::Generators::NamedBase
+      include ::Rails::Generators::Migration
+
+      source_root File.expand_path("templates", __dir__)
+
+      argument :attributes, type: :array, default: [], banner: "field[:type][:index] field[:type][:index]"
+
+      def self.next_migration_number _dirname
+        Time.now.strftime "%Y%m%d%H%M%S"
+      end
+
+      def create_migration_file
+        migration_template "migration.rb.erb", "db/migrate/#{file_name}.rb"
+        migration_template "up.sql.erb", "db/migrate/#{file_name}_up.sql"
+        migration_template "down.sql.erb", "db/migrate/#{file_name}_down.sql"
+      end
+    end
+  end
+end

data/lib/sequel/generators/model_generator.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Sequel
+  module Generators
+    class ModelGenerator < ::Rails::Generators::NamedBase
+      source_root File.expand_path("templates", __dir__)
+    end
+  end
+end

data/lib/sequel/{rails/generators/application_record → generators}/templates/application_record.rb.tt

@@ -4,7 +4,7 @@ class ApplicationRecord < Sequel::Model
   dataset = nil
 end
 
-# Allows subclassed models to be initialzed with a customized dataset
+# Allows subclassed models to be initialized with a customized dataset
 def ApplicationRecord *args
   ApplicationRecord.Model *args
 end

data/lib/sequel/generators/templates/down.sql.erb

@@ -0,0 +1 @@
+-- Write rollback migration here

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

@@ -0,0 +1,13 @@
+Sequel.migration do
+  up do
+    transaction do
+      run File.read(File.join(File.dirname(__FILE__), "#{File.basename(__FILE__, ".rb")}_up.sql"))
+    end
+  end
+
+  down do
+    transaction do
+      run File.read(File.join(File.dirname(__FILE__), "#{File.basename(__FILE__, ".rb")}_down.sql"))
+    end
+  end
+end

data/lib/sequel/generators/templates/up.sql.erb

@@ -0,0 +1 @@
+-- Write forwards migration here

data/lib/sequel/rails/railtie.rb

@@ -24,7 +24,7 @@ module Sequel
       ::Sequel::Rails::Railties::LogSubscriber.backtrace_cleaner.add_filter { |line| line.gsub(::Rails.root.to_s + File::SEPARATOR, "") }
 
       # Config initialization
-      config.app_generators.orm :sequelize_rails, migration: :sequel_migration
+      config.app_generators.orm :sequel
       config.sequel = ActiveSupport::OrderedOptions.new
 
       initializer "sequel.plugins" do
@@ -64,6 +64,12 @@ module Sequel
       rake_tasks do
         load File.expand_path("../tasks.rake", __dir__)
       end
+
+      generators do
+        require "sequel/generators/application_record_generator"
+        require "sequel/generators/migration_generator"
+        require "sequel/generators/model_generator"
+      end
     end
   end
 end

data/lib/sequel/rails/version.rb

@@ -2,6 +2,6 @@
 
 module Sequel
   module Rails
-    VERSION = "0.5.0"
+    VERSION = "0.6.1"
   end
 end

data/lib/sequel/rails.rb

@@ -7,12 +7,6 @@ require "sequel/rails/translation_support"
 # Plugins
 require "sequel/plugins/pretty_print"
 
-# Generators
-require "rails/generators"
-require "sequel/rails/generators/migration/migration_generator"
-require "sequel/rails/generators/model/model_generator"
-require "sequel/rails/generators/application_record/application_record_generator"
-
 # Minitest support
 begin
   gem "minitest"

data/lib/sequel/tasks.rake

@@ -141,7 +141,17 @@ db_namespace = namespace ns do
     end
 
     desc "Rolls back the last migration and re-runs it"
-    task redo: [:down, :up]
+    task redo: [:connection] do
+      # down
+      target = (migrator.applied_migrations[-2] || "0_").split("_", 2).first.to_i
+      migrator(target: target).run
+      # up
+      pending = migrator.migration_tuples.first
+      if pending
+        target = pending[1].split("_", 2).first.to_i
+        migrator(target: target).run
+      end
+    end
 
     desc "Displays the status of the database migrations"
     task status: [:connection] do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequelize-rails
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Kenaniah Cerny
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-04 00:00:00.000000000 Z
+date: 2023-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -161,14 +161,16 @@ files:
 - gemfiles/rails_6.gemfile
 - gemfiles/rails_7.gemfile
 - lib/sequel/extensions/sequel_instrumentation.rb
+- lib/sequel/generators/application_record_generator.rb
+- lib/sequel/generators/migration_generator.rb
+- lib/sequel/generators/model_generator.rb
+- lib/sequel/generators/templates/application_record.rb.tt
+- lib/sequel/generators/templates/down.sql.erb
+- lib/sequel/generators/templates/migration.rb.erb
+- lib/sequel/generators/templates/up.sql.erb
 - lib/sequel/plugins/pretty_print.rb
 - lib/sequel/rails.rb
 - lib/sequel/rails/db_console.rb
-- lib/sequel/rails/generators/application_record/application_record_generator.rb
-- lib/sequel/rails/generators/application_record/templates/application_record.rb.tt
-- lib/sequel/rails/generators/migration/migration_generator.rb
-- lib/sequel/rails/generators/migration/templates/migration.rb.erb
-- lib/sequel/rails/generators/model/model_generator.rb
 - lib/sequel/rails/minitest.rb
 - lib/sequel/rails/railtie.rb
 - lib/sequel/rails/railties/controller_runtime.rb

data/lib/sequel/rails/generators/application_record/application_record_generator.rb

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-module Sequel
-  module Rails
-    module Generators
-      class ApplicationRecordGenerator < ::Rails::Generators::Base
-        source_root File.expand_path("templates", __dir__)
-
-        def create_application_record
-          template "application_record.rb", application_record_file_name
-        end
-
-        private
-
-        def application_record_file_name
-          @application_record_file_name ||=
-            if namespaced?
-              "app/models/#{namespaced_path}/application_record.rb"
-            else
-              "app/models/application_record.rb"
-            end
-        end
-      end
-    end
-  end
-end

data/lib/sequel/rails/generators/migration/migration_generator.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-module Sequel
-  module Rails
-    module Generators
-      class MigrationGenerator < ::Rails::Generators::NamedBase
-        include ::Rails::Generators::Migration
-
-        source_root File.expand_path("templates", __dir__)
-
-        argument :attributes, type: :array, default: [], banner: "field[:type][:index] field[:type][:index]"
-
-        def self.next_migration_number _dirname
-          Time.now.strftime "%Y%m%d%H%M%S"
-        end
-
-        def create_migration_file
-          migration_template "migration.rb.erb", "db/migrate/#{file_name}.rb"
-        end
-      end
-    end
-  end
-end

data/lib/sequel/rails/generators/migration/templates/migration.rb.erb

@@ -1,9 +0,0 @@
-Sequel.migration do
-  up do
-    # Add forward migration code here
-  end
-
-  down do
-    # Add rollback migration code here
-  end
-end

data/lib/sequel/rails/generators/model/model_generator.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module Sequel
-  module Rails
-    module Generators
-      class ModelGenerator < ::Rails::Generators::NamedBase
-        source_root File.expand_path("templates", __dir__)
-      end
-    end
-  end
-end