sequel-rails 0.9.9 → 0.9.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 478a4c84f58ba853c223252af5ad88e61e5f4e15
-  data.tar.gz: 62818e8f6828c8ae34f5502113033545aa6ab43d
+  metadata.gz: eba946c66e7d9fa0575c3ca8be8d9b2814aea6f5
+  data.tar.gz: d2babb6feab008ba8a5351cdc8a8be90bad8b2d2
 SHA512:
-  metadata.gz: 10b648fb7f3f3b25d4afc48d0424f138986ca47a1d4b03a84e39c928db07345b0a58ee8e770f5fb2be36836f9963517782d77514f51c3aec8301b7a82d078b3c
-  data.tar.gz: 7538540f3a377f6a32c6d6d9563bfb947306d14d3937307d5489533670824bebb545a277336d362341669c9d6d52bb9a22bbd50827b69a8c8f228f948806f3d3
+  metadata.gz: 51725615f608c37dca7faafb45abd22861438d3b26d428c37577062703c9d9a6712a0585c7af3f0967419d823ff70d3b53c38ccf269f3d76af1dbd3b99754a24
+  data.tar.gz: 0df87880f42c040b73b312f397b65e82411109db500043ed6ae32def27c59c397851284cc7ed0628d4d3cb3129dccd0e6bfa226d7160c2b1efa00647f8abdc8e

data/.gitignore

@@ -5,6 +5,10 @@
 *.tmproj
 tmtags
 
+## IntelliJ IDEA
+
+*.iml
+
 ## EMACS
 *~
 \#*

data/History.md

@@ -1,3 +1,12 @@
+0.9.10 (2015-02-26)
+===================
+
+* Set `search_path` on PostgreSQL when dumping migration informations
+[#86](https://github.com/TalentBox/sequel-rails/pull/86)
+* Add `ActiveSupport.on_load :sequel` support (kr3ssh) [#85](https://github.com/TalentBox/sequel-rails/pull/85)
+* Added option to skip connect after Rails initialize with new option
+  `config.sequel.skip_connect = true`. (Alexander Birkner) [#83](https://github.com/TalentBox/sequel-rails/pull/83)
+
 0.9.9 (2015-01-04)
 ==================
 

data/README.md

@@ -152,6 +152,9 @@ You can configure some options with the usual rails mechanism, in
     # Configure whether database's rake tasks will be loaded or not
     # Defaults to true
     config.sequel.load_database_tasks = false
+
+    # This setting disabled the automatic connect after Rails init
+    config.sequel.skip_connect = true
 ```
 
 The connection settings are read from the file `config/database.yml` and is
@@ -349,6 +352,8 @@ Improvements has been made by those awesome contributors:
 * a3gis (a3gis)
 * Andrey Chernih (andreychernih)
 * Nico Rieck (gix)
+* Alexander Birkner (BirknerAlex)
+* kr3ssh (kressh)
 
 Credits
 =======

data/Rakefile

@@ -39,6 +39,7 @@ begin
     configs.each do |adapter, config|
       desc "Run specs for #{adapter} adapter"
       task adapter do
+        puts "running spec:#{adapter}"
         clean_env
         Rake::Task['spec'].reenable
         ENV['TEST_ADAPTER'] = adapter

data/lib/sequel_rails/configuration.rb

@@ -27,6 +27,7 @@ module SequelRails
       self.schema_dump = default_schema_dump
       self.load_database_tasks = true
       self.after_connect = nil
+      self.skip_connect = nil
     end
 
     def environment_for(name)

data/lib/sequel_rails/migrations.rb

@@ -18,23 +18,14 @@ module SequelRails
 
       def dump_schema_information(opts = {})
         sql = opts.fetch :sql
+        adapter = SequelRails::Storage.adapter_for(Rails.env)
         db = ::Sequel::Model.db
         res = ''
 
         if available_migrations?
           migrator_class = ::Sequel::Migrator.send(:migrator_class, migrations_dir)
           migrator = migrator_class.new db, migrations_dir
-
-          inserts = migrator.ds.map do |hash|
-            insert = migrator.ds.insert_sql(hash)
-            sql ? "#{insert};" : "    self << #{insert.inspect}"
-          end
-
-          if inserts.any?
-            res << "Sequel.migration do\n  change do\n" unless sql
-            res << inserts.join("\n")
-            res << "\n  end\nend\n" unless sql
-          end
+          res << adapter.schema_information_dump(migrator, sql)
         end
         res
       end

data/lib/sequel_rails/railtie.rb

@@ -39,6 +39,10 @@ module SequelRails
       load 'sequel_rails/railties/database.rake' if app.config.sequel.load_database_tasks
     end
 
+    initializer 'sequel.load_hooks' do |app|
+      ::ActiveSupport.run_load_hooks(:sequel, ::Sequel::Model)
+    end
+
     initializer 'sequel.configuration' do |app|
       configure_sequel app
     end
@@ -56,8 +60,10 @@ module SequelRails
       setup_controller_runtime
     end
 
-    initializer 'sequel.connect' do |_app|
-      ::SequelRails.setup ::Rails.env
+    initializer 'sequel.connect' do |app|
+      unless app.config.sequel[:skip_connect]
+        ::SequelRails.setup ::Rails.env
+      end
     end
 
     # Support overwriting crucial steps in subclasses

data/lib/sequel_rails/storage/abstract.rb

@@ -69,6 +69,28 @@ module SequelRails
         @collation ||= config['collation'] || ENV['COLLATION']
       end
 
+      def search_path
+        @search_path ||= config['search_path'] || '"$user", public'
+      end
+
+      def schema_information_dump(migrator, sql_dump)
+        res = ''
+        inserts = schema_information_inserts(migrator, sql_dump)
+        if inserts.any?
+          res = inserts.join("\n")
+          unless sql_dump
+            res = <<-EOS.strip_heredoc
+              Sequel.migration do
+                change do
+                  #{res}
+                end
+              end
+            EOS
+          end
+        end
+        res
+      end
+
       private
 
       def add_option(commands, name, value)
@@ -92,6 +114,35 @@ module SequelRails
       def safe_exec(args)
         exec SequelRails::Shellwords.join(Array(args))
       end
+
+      def schema_information_inserts(migrator, sql_dump)
+        migrator.ds.map do |hash|
+          insert = migrator.ds.insert_sql(hash)
+          sql_dump ? "#{insert};" : "self << #{insert.inspect}"
+        end
+      end
+
+      def schema_information_dump_with_search_path(migrator, sql_dump)
+        res = ''
+        inserts = schema_information_inserts(migrator, sql_dump)
+        if inserts.any?
+          set_search_path_sql = "SET search_path TO #{search_path}"
+          res = inserts.join("\n")
+          if sql_dump
+            res = "#{set_search_path_sql};\n#{res}"
+          else
+            res = <<-EOS.strip_heredoc
+              Sequel.migration do
+                change do
+                  self << #{set_search_path_sql.inspect}
+                  #{res}
+                end
+              end
+            EOS
+          end
+        end
+        res
+      end
     end
   end
 end

data/lib/sequel_rails/storage/jdbc.rb

@@ -71,6 +71,14 @@ module SequelRails
         end
       end
 
+      def schema_information_dump(migrator, sql_dump)
+        if _is_postgres?
+          schema_information_dump_with_search_path(migrator, sql_dump)
+        else
+          super
+        end
+      end
+
       private
 
       def collation

data/lib/sequel_rails/storage/postgres.rb

@@ -91,6 +91,10 @@ module SequelRails
         @maintenance_db ||= config['maintenance_db'] || ''
       end
 
+      def schema_information_dump(migrator, sql_dump)
+        schema_information_dump_with_search_path(migrator, sql_dump)
+      end
+
       private
 
       def with_pgpassword

data/lib/sequel_rails/version.rb

@@ -1,3 +1,3 @@
 module SequelRails
-  VERSION = '0.9.9'
+  VERSION = '0.9.10'
 end

data/spec/lib/sequel_rails/configuration_spec.rb

@@ -83,6 +83,22 @@ describe SequelRails::Configuration do
     end
   end
 
+  describe '#skip_connect' do
+    subject { described_class.new }
+
+    it 'defaults to nil' do
+      expect(subject.skip_connect).to be nil
+    end
+    it 'can be assigned' do
+      subject.skip_connect = true
+      expect(subject.skip_connect).to be true
+    end
+    it 'can be set from merging another hash' do
+      subject.merge!(:skip_connect => true)
+      expect(subject.skip_connect).to be true
+    end
+  end
+
   describe '#connect' do
     let(:environments) do
       {
@@ -347,5 +363,6 @@ describe SequelRails::Configuration do
         subject.connect environment
       end
     end
+
   end
 end

data/spec/lib/sequel_rails/railtie_spec.rb

@@ -127,4 +127,13 @@ describe SequelRails::Railtie do
       end
     end
   end
+
+  it 'run load hooks for :sequel passing ::Sequel::Model' do
+    class_context = nil
+    ::ActiveSupport.on_load :sequel do
+      class_context = self
+    end
+    app
+    expect( class_context ).to be ::Sequel::Model
+  end
 end

data/spec/lib/sequel_rails/railties/database_rake_spec.rb

@@ -29,13 +29,25 @@ describe 'Database rake tasks', :no_transaction => true do
         sql = Sequel::Model.db.from(
           :schema_migrations
         ).insert_sql(:filename => '1273253849_add_twitter_handle_to_users.rb')
-        expect(File.read(schema)).to include <<-EOS
-Sequel.migration do
-  change do
-    self << #{sql.inspect}
-  end
-end
-EOS
+        content = if ENV['TEST_ADAPTER']=='postgresql'
+          <<-EOS.strip_heredoc
+            Sequel.migration do
+              change do
+                self << "SET search_path TO \\"$user\\", public"
+                self << #{sql.inspect}
+              end
+            end
+          EOS
+        else
+          <<-EOS.strip_heredoc
+            Sequel.migration do
+              change do
+                self << #{sql.inspect}
+              end
+            end
+          EOS
+        end
+        expect(File.read(schema)).to include content
       end
     end
   end

metadata

@@ -1,190 +1,176 @@
 --- !ruby/object:Gem::Specification
 name: sequel-rails
 version: !ruby/object:Gem::Version
-  version: 0.9.9
+  version: 0.9.10
 platform: ruby
 authors:
 - Brasten Sager (brasten)
 - Jonathan TRON
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-01-04 00:00:00.000000000 Z
+date: 2015-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  name: activemodel
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.0
-  type: :runtime
+  name: railties
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
-  name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.0
-  type: :runtime
+  name: actionpack
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
-  name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.28'
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '5.0'
-  type: :runtime
+  name: sequel
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.28'
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: combustion
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: combustion
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: generator_spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: generator_spec
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.7
-  type: :development
+  name: rake
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.7
 - !ruby/object:Gem::Dependency
-  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
-  type: :development
+  name: rspec
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
-  type: :development
+  name: rspec-rails
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.28.0
-  type: :development
+  name: rubocop
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.28.0
 - !ruby/object:Gem::Dependency
-  name: ammeter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.1.2
-  type: :development
+  name: ammeter
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.1.2
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Integrate Sequel with Rails (3.x and 4.x)
 email:
 - brasten@gmail.com
@@ -195,10 +181,10 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .rubocop.yml
+- .travis.yml
 - Gemfile
 - History.md
 - LICENSE
@@ -274,25 +260,25 @@ homepage: http://talentbox.github.io/sequel-rails/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
-- "--charset=UTF-8"
+- --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.1.9
+signing_key:
 specification_version: 4
 summary: Use Sequel with Rails (3.x and 4.x)
 test_files: