switchman 1.2.30 → 1.2.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9d43f90b72896c88d968454e98ab442ad18194b
-  data.tar.gz: e600c3c7f45533d7b738b366c8d717c9fb08d71f
+  metadata.gz: 53cd4e7fcce2f4407fe0949804d90639a512c995
+  data.tar.gz: ce3c82b47b980fd7f6ec7cd6b5dfd11780b2c915
 SHA512:
-  metadata.gz: cabd3142197a1660624817a21ed5ac4a5776f5cb73160c57d85dc481c7ec6dd2490b5aa2aa1a46186ae0cec9ec401a3768a5ec6ceb36cb063a2846b017bf00a8
-  data.tar.gz: f85ac155c530ce54a18b044771ce6e2702129fdb4a340e2433f6b516598df8f99c13b5c99bbb628f1da8d948156c78bd0f44dad6189f04867a29f7519cd7fe95
+  metadata.gz: b5beda385f90fba2690e06f03c290721036fc6052f4606b660db51902ede7f6d6135c10309f50412abab80c6d91ce8a85943f2813c1add35812675a61d9246f6
+  data.tar.gz: 48f1fbb16e4ffa1a63bc07ed6d0faf83f4d3eba59d9a2361da775a351fd705b219bc9a638d89e96d030ca2f6b31a246ecd4b86630258612b1d460f47ec6222f4

data/lib/switchman/active_record/connection_pool.rb

@@ -36,13 +36,8 @@ module Switchman
         conn
       end
 
-      def release_connection_with_idle_timeout(*args)
-        if ::Rails.version < '4'
-          raise ArgumentError, "wrong number of arguments (1 for 0)" unless args.empty?
-          release_connection_without_idle_timeout
-        else
-          release_connection_without_idle_timeout(*args)
-        end
+      def release_connection_with_idle_timeout(with_id = current_connection_id)
+        release_connection_without_idle_timeout(with_id)
 
         # TODO may need a synchronize (or to be included in a synchronize
         # inside release_connection_without_idle_timeout) when we make

data/lib/switchman/database_server.rb

@@ -207,7 +207,7 @@ module Switchman
 
                 reset_column_information
                 unless create_schema == false
-                  migrate = -> { ::ActiveRecord::Migrator.migrate(::Rails.root + "db/migrate/") }
+                  migrate = -> { ::ActiveRecord::Migrator.migrate(::ActiveRecord::Migrator.migrations_paths) }
                   if ::ActiveRecord::Base.connection.supports_ddl_transactions?
                     ::ActiveRecord::Base.connection.transaction(requires_new: true, &migrate)
                   else

data/lib/switchman/version.rb

@@ -1,3 +1,3 @@
 module Switchman
-  VERSION = "1.2.30"
+  VERSION = "1.2.31"
 end

data/spec/dummy/config/initializers/migrations_path.rb

@@ -0,0 +1,5 @@
+migrations = Rails.root.join("db/migrate")
+
+unless ActiveRecord::Migrator.migrations_paths.any? { |p| File.expand_path(p).to_s == migrations.to_s }
+  ActiveRecord::Migrator.migrations_paths << migrations
+end

data/spec/dummy/db/schema.rb

@@ -9,59 +9,56 @@
 # from scratch. The latter is a flawed and unsustainable approach (the more migrations
 # you'll amass, the slower it'll run and the greater likelihood for issues).
 #
-# It's strongly recommended that you check this file into your version control system.
+# It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140219183820) do
+ActiveRecord::Schema.define(:version => 20140219183820) do
 
-  # These are extensions that must be enabled in order to support this database
-  enable_extension "plpgsql"
-
-  create_table "appendages", force: true do |t|
-    t.integer  "user_id",    limit: 8
+  create_table "appendages", :force => true do |t|
+    t.integer  "user_id",    :limit => 8
     t.integer  "value"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",              :null => false
+    t.datetime "updated_at",              :null => false
   end
 
-  create_table "digits", force: true do |t|
-    t.integer  "appendage_id", limit: 8
+  create_table "digits", :force => true do |t|
+    t.integer  "appendage_id", :limit => 8
     t.integer  "value"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                :null => false
+    t.datetime "updated_at",                :null => false
   end
 
-  create_table "features", force: true do |t|
-    t.integer  "owner_id",   limit: 8
+  create_table "features", :force => true do |t|
+    t.integer  "owner_id",   :limit => 8
     t.string   "owner_type"
     t.integer  "value"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",              :null => false
+    t.datetime "updated_at",              :null => false
   end
 
-  create_table "mirror_users", force: true do |t|
-    t.integer  "user_id",    limit: 8
-    t.datetime "created_at"
-    t.datetime "updated_at"
+  create_table "mirror_users", :force => true do |t|
+    t.integer  "user_id",    :limit => 8
+    t.datetime "created_at",              :null => false
+    t.datetime "updated_at",              :null => false
   end
 
-  create_table "roots", force: true do |t|
-    t.integer  "user_id",    limit: 8
-    t.datetime "created_at"
-    t.datetime "updated_at"
+  create_table "roots", :force => true do |t|
+    t.integer  "user_id",    :limit => 8
+    t.datetime "created_at",              :null => false
+    t.datetime "updated_at",              :null => false
   end
 
-  create_table "switchman_shards", force: true do |t|
+  create_table "switchman_shards", :force => true do |t|
     t.string  "name"
     t.string  "database_server_id"
-    t.boolean "default",            default: false, null: false
+    t.boolean "default",            :default => false, :null => false
   end
 
-  create_table "users", force: true do |t|
+  create_table "users", :force => true do |t|
     t.string   "name"
-    t.integer  "mirror_user_id", limit: 8
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "parent_id",      limit: 8
+    t.integer  "mirror_user_id", :limit => 8
+    t.datetime "created_at",                  :null => false
+    t.datetime "updated_at",                  :null => false
+    t.integer  "parent_id",      :limit => 8
   end
 
 end

data/spec/dummy/log/development.log

@@ -148,3 +148,4 @@ Migrating to CreateRoots (20140219183820)
   SQL (0.2ms)  UPDATE "switchman_shards" SET "name" = $1 WHERE "switchman_shards"."id" = 2  [["name", "switchman_development_shard_2"]]  [shard 1 master]
    (0.4ms)  COMMIT  [shard 1 master]
    (0.4ms)  select current_user  [shard 1 master]
+Connecting to database specified by database.yml