switchman 1.2.7 → 1.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80227d17c7587ce99df75ee7d181e2ff40cdbeb0
-  data.tar.gz: ac327051b373ac44f3a8e01bbfeec23891405bc8
+  metadata.gz: 62a38cba848a274d99ab64d7e6de6a9d3cf25d8a
+  data.tar.gz: fd23f4718d778dd580703478253658610c7bc2ba
 SHA512:
-  metadata.gz: 08f9fb72a1518b792bf7ebbad331b2191a1ed72e41d72850bb17a182dc1690fc31bbc78c8cb98ea2f52308e9ce20b3e13ece5b0bdbf8e727511de482c9fcfc4e
-  data.tar.gz: d2d7610a4f11918adcd79c1ab232f76fa01c212c4d9bd86962b039a60bf5f84797907fb3f08814105fd9c8130930d0aadc2c83f1ca541960bc5f1226a876fc75
+  metadata.gz: ce4357fb9fb1898b19c2dae8696ab457022bad518b871e38a06d03a64e3ef17fa137e7dceda600ba5acbfcd622004b35bd3fcfda6d23be4d7541e88da9ba873b
+  data.tar.gz: f8e25efd8028727f282b9d37598f6caa0dc83e8d39645e888bf9e7741a1658519c5623638a41c8628a22630d036966bde3a53f1eb91534b0cae7d281cac9ff39

data/lib/switchman/active_record/base.rb

@@ -82,16 +82,16 @@ module Switchman
 
       def save(*args)
         @shard_set_in_stone = true
-        self.class.shard(shard).scoping { super }
+        self.class.shard(shard, :implicit).scoping { super }
       end
 
       def save!(*args)
         @shard_set_in_stone = true
-        self.class.shard(shard).scoping { super }
+        self.class.shard(shard, :implicit).scoping { super }
       end
 
       def destroy
-        self.class.shard(shard).scoping { super }
+        self.class.shard(shard, :implicit).scoping { super }
       end
 
       def clone

data/lib/switchman/database_server.rb

@@ -15,11 +15,10 @@ module Switchman
 
       def create(settings = {})
         raise "database servers should be set up in database.yml" unless ::Rails.env.test?
-        id = 1
-        while database_servers[id.to_s]; id += 1; end
-        server = DatabaseServer.new({ :id => id.to_s }.merge(settings))
+        @id ||= 0
+        @id += 1
+        server = DatabaseServer.new({ :id => @id.to_s }.merge(settings))
         server.instance_variable_set(:@fake, true)
-        raise "database server #{server.id} already exists" if database_servers[server.id]
         database_servers[server.id] = server
       end
 

data/lib/switchman/r_spec_helper.rb

@@ -95,11 +95,17 @@ module Switchman
           shards << @shard1 unless @shard1.database_server == Shard.default.database_server
           shards.each do |shard|
             shard.activate do
-              # this is how AR does it in fixtures.rb
+              # this is how AR does it in database_statements.rb
               if ::Rails.version < '4'
-                ::ActiveRecord::Base.connection.increment_open_transactions
-                ::ActiveRecord::Base.connection.transaction_joinable = false
-                ::ActiveRecord::Base.connection.begin_db_transaction
+                conn = ::ActiveRecord::Base.connection
+                # support nested transactions around (groups of) specs (e.g. for once-ler) 
+                if conn.open_transactions == 0
+                  conn.transaction_joinable = false
+                  conn.begin_db_transaction
+                else
+                  conn.create_savepoint
+                end
+                conn.increment_open_transactions
               else
                 ::ActiveRecord::Base.connection.begin_transaction joinable: false
               end
@@ -115,9 +121,12 @@ module Switchman
           shards.each do |shard|
             shard.activate do
               if ::Rails.version < '4'
-                if ::ActiveRecord::Base.connection.open_transactions != 0
-                  ::ActiveRecord::Base.connection.rollback_db_transaction
-                  ::ActiveRecord::Base.connection.decrement_open_transactions
+                conn = ::ActiveRecord::Base.connection
+                conn.decrement_open_transactions
+                if conn.open_transactions == 0
+                  conn.rollback_db_transaction
+                else
+                  conn.rollback_to_savepoint
                 end
               else
                 ::ActiveRecord::Base.connection.rollback_transaction if ::ActiveRecord::Base.connection.transaction_open?

data/lib/switchman/version.rb

@@ -1,3 +1,3 @@
 module Switchman
-  VERSION = "1.2.7"
+  VERSION = "1.2.8"
 end

data/spec/dummy/config/database.yml

@@ -0,0 +1,23 @@
+# SQLite version 3.x
+#   gem install sqlite3
+#
+#   Ensure the SQLite 3 gem is defined in your Gemfile
+#   gem 'sqlite3'
+development:
+  adapter: postgresql
+  database: switchman_development
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  adapter: sqlite3
+  database: db/test.sqlite3
+  pool: 5
+  timeout: 5000
+
+production:
+  adapter: sqlite3
+  database: db/production.sqlite3
+  pool: 5
+  timeout: 5000

data/spec/dummy/db/schema.rb

@@ -0,0 +1,67 @@
+# encoding: UTF-8
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# 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.
+
+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
+    t.integer  "value"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "digits", force: true do |t|
+    t.integer  "appendage_id", limit: 8
+    t.integer  "value"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  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"
+  end
+
+  create_table "mirror_users", force: true do |t|
+    t.integer  "user_id",    limit: 8
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "roots", force: true do |t|
+    t.integer  "user_id",    limit: 8
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "switchman_shards", force: true do |t|
+    t.string  "name"
+    t.string  "database_server_id"
+    t.boolean "default",            default: false, null: false
+  end
+
+  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
+  end
+
+end

data/spec/dummy/log/development.log

@@ -0,0 +1,87 @@
+   (1.0ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (1.3ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to CreateSwitchmanShards (20130328212039)
+   (0.0ms)  begin transaction
+   (0.4ms)  CREATE TABLE "switchman_shards" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255), "database_server_id" varchar(255), "default" boolean DEFAULT 'f' NOT NULL) 
+  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20130328212039"]]
+   (0.8ms)  commit transaction
+Migrating to CreateDefaultShard (20130328224244)
+   (0.1ms)  begin transaction
+  Switchman::Shard Exists (0.1ms)  SELECT 1 AS one FROM "switchman_shards" WHERE "switchman_shards"."default" = 't' LIMIT 1
+  SQL (0.3ms)  INSERT INTO "switchman_shards" ("default") VALUES (?)  [["default", true]]
+  Switchman::Shard Load (0.1ms)  SELECT "switchman_shards".* FROM "switchman_shards" WHERE "switchman_shards"."default" = 't' LIMIT 1
+   (0.2ms)  begin transaction  [shard 1 deploy]
+  SQL (5023.8ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20130328224244"]]  [shard 1 deploy]
+SQLite3::BusyException: database is locked: INSERT INTO "schema_migrations" ("version") VALUES (?)
+   (0.1ms)  rollback transaction  [shard 1 deploy]
+   (6.5ms)  rollback transaction
+   (1.3ms)  SELECT * FROM unnest(current_schemas(false))
+PG::UndefinedTable: ERROR:  relation "switchman_shards" does not exist
+LINE 5:                WHERE a.attrelid = '"switchman_shards"'::regc...
+                                          ^
+:               SELECT a.attname, format_type(a.atttypid, a.atttypmod),
+                     pg_get_expr(d.adbin, d.adrelid), a.attnotnull, a.atttypid, a.atttypmod
+                FROM pg_attribute a LEFT JOIN pg_attrdef d
+                  ON a.attrelid = d.adrelid AND a.attnum = d.adnum
+               WHERE a.attrelid = '"switchman_shards"'::regclass
+                 AND a.attnum > 0 AND NOT a.attisdropped
+               ORDER BY a.attnum
+
+   (2.0ms)  CREATE TABLE "schema_migrations" ("version" character varying(255) NOT NULL) 
+   (1.2ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to CreateSwitchmanShards (20130328212039)
+   (0.1ms)  BEGIN
+   (3.7ms)  CREATE TABLE "switchman_shards" ("id" bigserial primary key, "name" character varying(255), "database_server_id" character varying(255), "default" boolean DEFAULT 'f' NOT NULL) 
+  SQL (0.5ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1)  [["version", "20130328212039"]]
+   (0.4ms)  COMMIT
+Migrating to CreateDefaultShard (20130328224244)
+   (0.3ms)  BEGIN
+  Switchman::Shard Exists (0.5ms)  SELECT 1 AS one FROM "switchman_shards" WHERE "switchman_shards"."default" = 't' LIMIT 1
+  SQL (0.5ms)  INSERT INTO "switchman_shards" ("default") VALUES ($1) RETURNING "id"  [["default", true]]
+  Switchman::Shard Load (0.2ms)  SELECT "switchman_shards".* FROM "switchman_shards" WHERE "switchman_shards"."default" = 't' LIMIT 1
+  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1)  [["version", "20130328224244"]]
+   (0.3ms)  COMMIT
+Migrating to CreateUsers (20130403132607)
+   (0.1ms)  BEGIN
+   (1.8ms)  CREATE TABLE "users" ("id" bigserial primary key, "name" character varying(255), "mirror_user_id" bigint, "created_at" timestamp, "updated_at" timestamp) 
+  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1)  [["version", "20130403132607"]]
+   (0.4ms)  COMMIT
+Migrating to CreateAppendages (20130411202442)
+   (0.1ms)  BEGIN
+   (1.7ms)  CREATE TABLE "appendages" ("id" bigserial primary key, "user_id" bigint, "value" integer, "created_at" timestamp, "updated_at" timestamp) 
+  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1)  [["version", "20130411202442"]]
+   (0.4ms)  COMMIT
+Migrating to CreateMirrorUsers (20130411202551)
+   (0.1ms)  BEGIN
+   (1.6ms)  CREATE TABLE "mirror_users" ("id" bigserial primary key, "user_id" bigint, "created_at" timestamp, "updated_at" timestamp) 
+  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1)  [["version", "20130411202551"]]
+   (0.3ms)  COMMIT
+Migrating to CreateDigits (20131022202028)
+   (0.1ms)  BEGIN
+   (1.6ms)  CREATE TABLE "digits" ("id" bigserial primary key, "appendage_id" bigint, "value" integer, "created_at" timestamp, "updated_at" timestamp) 
+  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1)  [["version", "20131022202028"]]
+   (0.3ms)  COMMIT
+Migrating to CreateFeatures (20131206172923)
+   (0.1ms)  BEGIN
+   (1.9ms)  CREATE TABLE "features" ("id" bigserial primary key, "owner_id" bigint, "owner_type" character varying(255), "value" integer, "created_at" timestamp, "updated_at" timestamp) 
+  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1)  [["version", "20131206172923"]]
+   (0.3ms)  COMMIT
+Migrating to AddParentIdToUsers (20140123154135)
+   (0.1ms)  BEGIN
+   (0.2ms)  ALTER TABLE "users" ADD COLUMN "parent_id" bigint
+  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1)  [["version", "20140123154135"]]
+   (0.3ms)  COMMIT
+Migrating to CreateRoots (20140219183820)
+   (0.1ms)  BEGIN
+   (1.7ms)  CREATE TABLE "roots" ("id" bigserial primary key, "user_id" bigint, "created_at" timestamp, "updated_at" timestamp) 
+  SQL (0.4ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1)  [["version", "20140219183820"]]
+   (0.4ms)  COMMIT
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (1.0ms)  SELECT * FROM unnest(current_schemas(false))
+  Switchman::Shard Load (0.3ms)  SELECT "switchman_shards".* FROM "switchman_shards" WHERE "switchman_shards"."default" = 't' LIMIT 1
+   (0.2ms)  SELECT * FROM unnest(current_schemas(false))
+  Switchman::Shard Load (0.7ms)  SELECT "switchman_shards".* FROM "switchman_shards" WHERE "switchman_shards"."database_server_id" = 'test' AND "switchman_shards"."name" IS NULL ORDER BY "switchman_shards"."id" ASC LIMIT 1
+  Switchman::Shard Load (0.4ms)  SELECT "switchman_shards".* FROM "switchman_shards" WHERE "switchman_shards"."database_server_id" = 'production' AND "switchman_shards"."name" IS NULL ORDER BY "switchman_shards"."id" ASC LIMIT 1
+   (0.7ms)  SELECT COUNT(*) FROM "users"  [shard 1 master]

data/spec/lib/r_spec_helper_spec.rb

@@ -2,19 +2,73 @@ require "spec_helper"
 
 module Switchman
   describe RSpecHelper do
-    # strategically place these before we include the module
-    before(:all) do
-      Shard.default.should be_a(DefaultShard)
-    end
+    context "sharding" do
+      # strategically place these before we include the module
+      before(:all) do
+        Shard.default.should be_a(DefaultShard)
+      end
+
+      after(:all) do
+        Shard.default.should be_a(DefaultShard)
+      end
 
-    after(:all) do
-      Shard.default.should be_a(DefaultShard)
+      include RSpecHelper
+
+      it "should make the default shard a real shard" do
+        Shard.default.should be_a(Shard)
+      end
     end
 
-    include RSpecHelper
+    context "transactions" do
+      include RSpecHelper
+
+      def begin_transaction(conn)
+        if ::Rails.version < '4'
+          conn.transaction_joinable = false
+          conn.begin_db_transaction
+          conn.increment_open_transactions
+        else
+          conn.begin_transaction joinable: false
+        end
+      end
+
+      def rollback_transaction(conn)
+        if ::Rails.version < '4'
+          conn.decrement_open_transactions
+          if conn.open_transactions == 0
+            conn.rollback_db_transaction
+          else
+            conn.rollback_to_savepoint
+          end
+        else
+          conn.rollback_transaction
+        end
+      end
+
+      before :all do
+        @shard2.activate do
+          begin_transaction(::ActiveRecord::Base.connection)
+          User.create!
+        end
+      end
+
+      it "should support nested transactions" do
+        @shard2.activate do |shard|
+          User.count.should == 1 # we get the user from the before :all
+          User.create! # should only last for the duration of this spec
+          conn = ::ActiveRecord::Base.connection
+          conn.open_transactions.should eql 2
+        end
+      end
 
-    it "should make the default shard a real shard" do
-      Shard.default.should be_a(Shard)
+      prepend_after :all do
+        @shard2.activate do
+          User.count.should == 1
+          conn = ::ActiveRecord::Base.connection
+          conn.open_transactions.should eql 1 # RSpecHelper shouldn't have rolled back the before :all one above
+          rollback_transaction(::ActiveRecord::Base.connection)
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.2.8
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-01 00:00:00.000000000 Z
+date: 2014-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -66,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.5
-- !ruby/object:Gem::Dependency
-  name: debugger
-  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'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -183,6 +169,7 @@ files:
 - spec/dummy/app/models/user.rb
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
+- spec/dummy/config/database.yml
 - spec/dummy/config/database.yml.example
 - spec/dummy/config/environment.rb
 - spec/dummy/config/environments/development.rb
@@ -194,6 +181,7 @@ files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
+- spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/20130403132607_create_users.rb
 - spec/dummy/db/migrate/20130411202442_create_appendages.rb
 - spec/dummy/db/migrate/20130411202551_create_mirror_users.rb
@@ -201,6 +189,8 @@ files:
 - spec/dummy/db/migrate/20131206172923_create_features.rb
 - spec/dummy/db/migrate/20140123154135_add_parent_id_to_users.rb
 - spec/dummy/db/migrate/20140219183820_create_roots.rb
+- spec/dummy/db/schema.rb
+- spec/dummy/log/development.log
 - spec/dummy/Rakefile
 - spec/dummy/script/rails
 - spec/lib/action_controller/caching_spec.rb
@@ -257,6 +247,7 @@ test_files:
 - spec/dummy/app/models/user.rb
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
+- spec/dummy/config/database.yml
 - spec/dummy/config/database.yml.example
 - spec/dummy/config/environment.rb
 - spec/dummy/config/environments/development.rb
@@ -268,6 +259,7 @@ test_files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
+- spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/20130403132607_create_users.rb
 - spec/dummy/db/migrate/20130411202442_create_appendages.rb
 - spec/dummy/db/migrate/20130411202551_create_mirror_users.rb
@@ -275,6 +267,8 @@ test_files:
 - spec/dummy/db/migrate/20131206172923_create_features.rb
 - spec/dummy/db/migrate/20140123154135_add_parent_id_to_users.rb
 - spec/dummy/db/migrate/20140219183820_create_roots.rb
+- spec/dummy/db/schema.rb
+- spec/dummy/log/development.log
 - spec/dummy/Rakefile
 - spec/dummy/script/rails
 - spec/lib/action_controller/caching_spec.rb