switchman 1.12.16 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b494eb251b67d98437463c5dac44cc3b179365103290a3858ca93925833666c
-  data.tar.gz: 5d93b3b4142e542721960093e73057ccc8ad1105b67d05e1f7ecd2f4c817c7a6
+  metadata.gz: e2f68441314d99fc739f03cd1af70e938efa0d0803ff6f5c405aed15afea0798
+  data.tar.gz: 553846718daea03d833792d3ff079ee0ce2bddce63231f2e40262fe901c84949
 SHA512:
-  metadata.gz: e447c0c2d8271cdd50dc69ebcc2da5df36089d32bfcd26ad220c61584f1d43679961ecbb3d017f8521742cae8d6780eee291e8e602b7a423ef935e795db6bf75
-  data.tar.gz: '09051aac58f8bfe85c8f2ae9f645a999daf0f4ad25d24aa3ef095bdf691fba11956423de73b9629b9f39bfe0ebf66c437282e27b69f2907783caaa79b021689e'
+  metadata.gz: 4d05aea36873a2d809b414ad9cceeb8e1ee3c0966acd7e67e3f941e3b971c685a3a7ad666d19b5a74edc47ba59025782a486c70c596d918998ef01a01c5b9f40
+  data.tar.gz: 02bb3d231398cae6966ec6d8f1ca5ce4101f529d55dc119ebcbd512077ab3c5887c3eb9309fc5a8aba2df7fcd5eb21fae9911c1c2b4c29cfc328653a52fa3d1f

data/app/models/switchman/shard_internal.rb

@@ -641,8 +641,6 @@ module Switchman
                 end
               end
             end
-          when 'sqlite3'
-            File.delete(self.name) unless self.name == ':memory:'
         end
       rescue
         logger.info "Drop failed: #{$!}"

data/lib/switchman/active_record/base.rb

@@ -4,6 +4,11 @@ module Switchman
       module ClassMethods
         delegate :shard, to: :all
 
+        def find_ids_in_ranges(opts={}, &block)
+          opts.reverse_merge!(:loose => true)
+          all.find_ids_in_ranges(opts, &block)
+        end
+
         def shard_category
           connection_specification_name.to_sym
         end

data/lib/switchman/active_record/relation.rb

@@ -67,6 +67,34 @@ module Switchman
         RUBY
       end
 
+      def find_ids_in_ranges(options = {})
+        is_integer = columns_hash[primary_key.to_s].type == :integer
+        loose_mode = options[:loose] && is_integer
+        # loose_mode: if we don't care about getting exactly batch_size ids in between
+        # don't get the max - just get the min and add batch_size so we get that many _at most_
+        values = loose_mode ? "MIN(id)" : "MIN(id), MAX(id)"
+
+        batch_size = options[:batch_size].try(:to_i) || 1000
+        quoted_primary_key = "#{klass.connection.quote_local_table_name(table_name)}.#{klass.connection.quote_column_name(primary_key)}"
+        as_id = " AS id" unless primary_key == 'id'
+        subquery_scope = except(:select).select("#{quoted_primary_key}#{as_id}").reorder(primary_key.to_sym).limit(loose_mode ? 1 : batch_size)
+        subquery_scope = subquery_scope.where("#{quoted_primary_key} <= ?", options[:end_at]) if options[:end_at]
+
+        first_subquery_scope = options[:start_at] ? subquery_scope.where("#{quoted_primary_key} >= ?", options[:start_at]) : subquery_scope
+
+        ids = connection.select_rows("SELECT #{values} FROM (#{first_subquery_scope.to_sql}) AS subquery").first
+
+        while ids.first.present?
+          ids.map!(&:to_i) if is_integer
+          ids << ids.first + batch_size if loose_mode
+
+          yield(*ids)
+          last_value = ids.last
+          next_subquery_scope = subquery_scope.where(["#{quoted_primary_key}>?", last_value])
+          ids = connection.select_rows("SELECT #{values} FROM (#{next_subquery_scope.to_sql}) AS subquery").first
+        end
+      end
+
       def activate(&block)
         shards = all_shards
         if (Array === shards && shards.length == 1)

data/lib/switchman/database_server.rb

@@ -116,7 +116,7 @@ module Switchman
         config = config.first if config.is_a?(Array)
         username = config[:username]
       end
-      @shareable = self.config[:adapter] != 'sqlite3' && username !~ /%?\{[a-zA-Z0-9_]+\}/
+      @shareable = username !~ /%?\{[a-zA-Z0-9_]+\}/
     end
 
     def shards
@@ -143,8 +143,6 @@ module Switchman
         when 'postgresql'
           create_statement = lambda { "CREATE SCHEMA #{name}" }
           password = " PASSWORD #{::ActiveRecord::Base.connection.quote(config[:password])}" if config[:password]
-        when 'sqlite3'
-          # no create_statement
         else
           create_statement = lambda { "CREATE DATABASE #{name}" }
       end
@@ -172,14 +170,10 @@ module Switchman
 
         if name.nil?
           base_name = self.config[:database].to_s % self.config
-          base_name = $1 if base_name =~ /(?:.*\/)(.+)_shard_\d+(?:\.sqlite3)?$/
           base_name = nil if base_name == ':memory:'
           base_name << '_' if base_name
           base_id = shard_id || SecureRandom.uuid
           name = "#{base_name}shard_#{base_id}"
-          if config[:adapter] == 'sqlite3'
-            name = File.join('db', "#{name}.sqlite3")
-          end
         end
 
         shard = Shard.create!(:id => shard_id,

data/lib/switchman/r_spec_helper.rb

@@ -149,7 +149,7 @@ module Switchman
       end
 
       klass.after(:all) do
-        Shard.delete_all
+        Shard.connection.update("TRUNCATE #{Shard.quoted_table_name} CASCADE")
         Switchman.cache.delete("default_shard")
         Shard.default(true)
       end

data/lib/switchman/version.rb

@@ -1,3 +1,3 @@
 module Switchman
-  VERSION = "1.12.16"
+  VERSION = "1.13.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 1.12.16
+  version: 1.13.0
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-15 00:00:00.000000000 Z
+date: 2019-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -150,20 +150,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.15'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement