sequel-rails 0.4.3 → 0.4.4

data/History.md

@@ -1,3 +1,11 @@
+0.4.4 (2013-06-06)
+==================
+
+* Fix schema_dumper extension inclusion to remove deprecation warning in
+  Sequel 3.48 (Jacques Crocker)
+* Add support for dumping/loading sql schema for MySQL (Saulius Grigaliunas)
+* Add support for configuring max connections in app config (Rafał Rzepecki)
+
 0.4.3 (2013-04-03)
 ==================
 

data/README.md

@@ -128,6 +128,8 @@ Improvements has been made by those awesome contributors:
 * Ed Ruder (edruder)
 * Rafał Rzepecki (dividedmind)
 * Sean Sorrell (rudle)
+* Saulius Grigaliunas (sauliusg)
+* Jacques Crocker (railsjedi)
 
 Credits
 =======

data/lib/sequel_rails/configuration.rb

@@ -38,6 +38,7 @@ module SequelRails
   private
 
     def initialize(root, database_yml_hash)
+      super()
       @root, @raw = root, database_yml_hash
     end
 
@@ -72,6 +73,9 @@ module SequelRails
         end
       end
 
+      # override max connections if requested in app configuration
+      config['max_connections'] = max_connections if max_connections
+
       # some adapters only support an url
       if config['adapter'] && config['adapter'] =~ /^(jdbc|do):/
         params = {}

data/lib/sequel_rails/railties/database.rake

@@ -18,7 +18,7 @@ namespace :db do
   namespace :schema do
     desc "Create a db/schema.rb file that can be portably used against any DB supported by Sequel"
     task :dump => :environment do
-      ::Sequel.extension :schema_dumper
+      db_for_current_env.extension :schema_dumper
       File.open(ENV['SCHEMA'] || "#{Rails.root}/db/schema.rb", "w") do |file|
         file.write db_for_current_env.dump_schema_migration(:same_db => true)
       end

data/lib/sequel_rails/storage/mysql.rb

@@ -11,6 +11,26 @@ module SequelRails
         execute("DROP DATABASE IF EXISTS `#{database}`")
       end
 
+      def _dump filename
+        commands = %w(mysqldump --no-data)
+        commands << "--user=#{Shellwords.escape(username)}" unless username.blank?
+        commands << "--password=#{Shellwords.escape(password)}" unless password.blank?
+        commands << "--host=#{host}" unless host.blank?
+        commands << "--result-file" << filename
+        commands << database
+        system(*commands)
+      end
+
+      def _load filename
+        commands = %w(mysql)
+        commands << "--user=#{Shellwords.escape(username)}" unless username.blank?
+        commands << "--password=#{Shellwords.escape(password)}" unless password.blank?
+        commands << "--host=#{host}" unless host.blank?
+        commands << '--execute' << %{SET FOREIGN_KEY_CHECKS = 0; SOURCE #{filename}; SET FOREIGN_KEY_CHECKS = 1}
+        commands << '--database' << database
+        system(*commands)
+      end
+
       private
 
       def execute(statement)

data/lib/sequel_rails/version.rb

@@ -1,3 +1,3 @@
 module SequelRails
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end

data/spec/lib/sequel_rails/configuration_spec.rb

@@ -41,12 +41,46 @@ describe SequelRails::Configuration do
   subject { SequelRails.setup(environment) }
 
   describe ".setup" do
+    
+    shared_context "max_connections" do
+      let(:max_connections) { 31337 }
+      before do
+        environments[environment]["max_connections"] = 7
+        SequelRails.configuration.max_connections = max_connections
+      end
+    end
+    
+    shared_examples "max_connections_c" do
+      context "with max_connections config option" do
+        include_context "max_connections"
+        it "overrides the option from the configuration" do
+          ::Sequel.should_receive(:connect) do |hash|
+              hash['max_connections'].should == max_connections
+          end
+          subject
+        end
+      end
+    end
 
-    context "for a postgres connection" do
+    shared_examples "max_connections_j" do
+      context "with max_connections config option" do
+        include_context "max_connections"
+        it "overrides the option from the configuration" do
+          ::Sequel.should_receive(:connect) do |url, hash|
+            url.should include("max_connections=#{max_connections}")
+          end
+          subject
+        end
+      end
+    end
 
+    context "for a postgres connection" do
+      
       let(:environment) { 'development' }
 
       context "in C-Ruby" do
+        
+        include_examples "max_connections_c"
 
         it "produces a sane config without url" do
           ::Sequel.should_receive(:connect) do |hash|
@@ -54,9 +88,12 @@ describe SequelRails::Configuration do
           end
           subject
         end
+        
       end
 
       context "in JRuby" do
+        
+        include_examples "max_connections_j"
 
         let(:is_jruby) { true }
 
@@ -72,11 +109,13 @@ describe SequelRails::Configuration do
     end
 
     context "for a mysql connection" do
-
+        
       let(:environment) { 'remote' }
 
       context "in C-Ruby" do
 
+        include_examples "max_connections_c"
+
         it "produces a config without url" do
           ::Sequel.should_receive(:connect) do |hash|
             hash['adapter'].should == 'mysql'
@@ -86,6 +125,8 @@ describe SequelRails::Configuration do
       end
 
       context "in JRuby" do
+        
+        include_examples "max_connections_j"
 
         let(:is_jruby) { true }
 

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: sequel-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  prerelease: 
+  version: 0.4.4
 platform: ruby
 authors:
 - Brasten Sager (brasten)
@@ -9,92 +10,104 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-03 00:00:00.000000000 Z
+date: 2013-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.28'
+    none: false
   type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.28'
-  name: sequel
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.0
+    none: false
   type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.0
-  name: railties
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.8.7
+    none: false
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.8.7
-  name: rake
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.7.0
+    none: false
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.7.0
-  name: rspec
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
+  name: combustion
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.1
+    none: false
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.1
-  name: combustion
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
+  name: generator_spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.7
+    none: false
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.7
-  name: generator_spec
+    none: false
+  prerelease: false
 description: Integrate Sequel with Rails 3
 email:
 - brasten@gmail.com
@@ -162,7 +175,6 @@ files:
 - tasks/spec.rake
 homepage: https://github.com/TalentBox/sequel-rails
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
@@ -172,17 +184,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      segments:
+      - 0
+      hash: 4249584526401999272
       version: '0'
+  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      segments:
+      - 0
+      hash: 4249584526401999272
       version: '0'
+  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Use Sequel with Rails 3
 test_files:
 - spec/internal/Rakefile

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZGUzMDc4YTE3MzgzNDk3OTk0YWIzOTJhZDkyYmZiM2Q1ZGI0N2QxNA==
-  data.tar.gz: !binary |-
-    ZTUzM2RjZDFjZmQ1NjljYTU3NTE5MTcwODBhZjkzODNiMWI0NWM1Mw==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    YTE4ZDhjNDllOGNhNzA2MzZmMTczMmM1Yjk4MDMzZWI2ZDM2YTAwNzU2MWRh
-    M2UxYmJkYjA2YWFmOGQ2MjYwNTcyYjNlOGI3ZWYwODBjYTU0YThhZjlhYmNl
-    MmQ0NzQ1MzExOTliYWRlNjhkMzYwNDAxMTAyZWRhYTBlMzcxZTE=
-  data.tar.gz: !binary |-
-    NjdlNmEwNWM1MjM3NmVmZjVlMDIzYjY1MzcwOGZlMTFhNzIyY2EzNGIzMDIw
-    MmEyNzc2NDEyNDUyZTllY2IwNmYzODI4YmVmYzc2YWEzY2ZlZTZiZTU3ZGY1
-    MTA2YzkyY2JkNDJiZDZiYmQzZDA3YzMzMDBlZDkwMjIzOGJkMjk=