apartment 0.20.0 → 0.21.0

data/apartment.gemspec

@@ -20,4 +20,4 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'activerecord',    '>= 3.1.2'   # must be >= 3.1.2 due to bug in prepared_statements
   s.add_dependency 'rack',            '>= 1.3.6'
-end
+end

data/lib/apartment/adapters/abstract_jdbc_adapter.rb

@@ -0,0 +1,51 @@
+module Apartment
+
+  module Adapters
+
+    class AbstractJDBCAdapter < AbstractAdapter
+
+      #   Drop the database
+      #
+      #   @param {String} database Database name
+      #
+      def drop(database)
+        super(database)
+
+      rescue ActiveRecord::StatementInvalid, ActiveRecord::JDBCError
+        raise DatabaseNotFound, "The database #{environmentify(database)} cannot be found"
+      end
+
+      protected
+
+      #   Create the database
+      #
+      #   @param {String} database Database name
+      #
+      def create_database(database)
+        super(database)
+
+      rescue ActiveRecord::StatementInvalid, ActiveRecord::JDBCError
+        raise DatabaseExists, "The database #{environmentify(database)} already exists."
+      end
+
+      #   Connect to new database
+      #
+      #   @param {String} database Database name
+      #
+      def connect_to_new(database)
+        super(database)
+
+      rescue ActiveRecord::StatementInvalid, ActiveRecord::JDBCError
+        raise DatabaseNotFound, "The database #{environmentify(database)} cannot be found."
+      end
+
+      #   Return a new config that is multi-tenanted
+      #
+      def multi_tenantify(database)
+        @config.clone.tap do |config|
+          config[:url] = "#{config[:url].gsub(/(\S+)\/.+$/, '\1')}/#{environmentify(database)}"
+        end
+      end
+    end
+  end
+end

data/lib/apartment/adapters/jdbc_mysql_adapter.rb

@@ -0,0 +1,28 @@
+module Apartment
+
+  module Database
+    def self.jdbc_mysql_adapter(config)
+      Adapters::JDBCMysqlAdapter.new config
+    end
+  end
+
+  module Adapters
+    class JDBCMysqlAdapter < AbstractJDBCAdapter
+
+      protected
+
+      #   Connect to new database
+      #   Abstract adapter will catch generic ActiveRecord error
+      #   Catch specific adapter errors here
+      #
+      #   @param {String} database Database name
+      #
+      def connect_to_new(database)
+        super
+      rescue DatabaseNotFound
+        Apartment::Database.reset
+        raise DatabaseNotFound, "Cannot find database #{environmentify(database)}"
+      end
+    end
+  end
+end

data/lib/apartment/adapters/jdbc_postgresql_adapter.rb

@@ -0,0 +1,127 @@
+module Apartment
+
+  module Database
+
+    def self.jdbc_postgresql_adapter(config)
+      Apartment.use_schemas ?
+          Adapters::JDBCPostgresqlSchemaAdapter.new(config) :
+          Adapters::JDBCPostgresqlAdapter.new(config)
+    end
+  end
+
+  module Adapters
+
+    # Default adapter when not using Postgresql Schemas
+    class JDBCPostgresqlAdapter < AbstractJDBCAdapter
+
+      protected
+
+      #   Connect to new database
+      #   Abstract adapter will catch generic ActiveRecord error
+      #   Catch specific adapter errors here
+      #
+      #   @param {String} database Database name
+      #
+      def connect_to_new(database)
+        super(database)
+      rescue ActiveRecord::StatementInvalid, ActiveRecord::JDBCError
+        raise DatabaseNotFound, "Cannot find database #{environmentify(database)}"
+      end
+
+      def create_database(database)
+        # There is a bug in activerecord-jdbcpostgresql-adapter (1.2.5) that will cause
+        # an exception if no options are passed into the create_database call.
+        Apartment.connection.create_database(environmentify(database), { :thisisahack => '' })
+
+      rescue ActiveRecord::StatementInvalid, ActiveRecord::JDBCError
+        raise DatabaseExists, "The database #{environmentify(database)} already exists."
+      end
+    end
+
+    # Separate Adapter for Postgresql when using schemas
+    class JDBCPostgresqlSchemaAdapter < AbstractJDBCAdapter
+
+      #   Drop the database schema
+      #
+      #   @param {String} database Database (schema) to drop
+      #
+      def drop(database)
+        Apartment.connection.execute(%{DROP SCHEMA "#{database}" CASCADE})
+
+      rescue ActiveRecord::StatementInvalid, ActiveRecord::JDBCError
+        raise SchemaNotFound, "The schema #{database.inspect} cannot be found."
+      end
+
+      #   Reset search path to default search_path
+      #   Set the table_name to always use the default namespace for excluded models
+      #
+      def process_excluded_models
+        Apartment.excluded_models.each do |excluded_model|
+          # Note that due to rails reloading, we now take string references to classes rather than
+          # actual object references.  This way when we contantize, we always get the proper class reference
+          if excluded_model.is_a? Class
+            warn "[Deprecation Warning] Passing class references to excluded models is now deprecated, please use a string instead"
+            excluded_model = excluded_model.name
+          end
+
+          excluded_model.constantize.tap do |klass|
+            # some models (such as delayed_job) seem to load and cache their column names before this,
+            # so would never get the default prefix, so reset first
+            klass.reset_column_information
+
+            # Ensure that if a schema *was* set, we override
+            table_name = klass.table_name.split('.', 2).last
+
+            # Not sure why, but Delayed::Job somehow ignores table_name_prefix...  so we'll just manually set table name instead
+            klass.table_name = "#{Apartment.default_schema}.#{table_name}"
+          end
+        end
+      end
+
+      #   Reset schema search path to the default schema_search_path
+      #
+      #   @return {String} default schema search path
+      #
+      def reset
+        @current_database = Apartment.default_schema
+        Apartment.connection.schema_search_path = full_search_path
+      end
+
+      def current_database
+        @current_database || Apartment.default_schema
+      end
+
+      protected
+
+      #   Set schema search path to new schema
+      #
+      def connect_to_new(database = nil)
+        return reset if database.nil?
+
+        @current_database = database.to_s
+        Apartment.connection.schema_search_path = full_search_path
+
+      rescue ActiveRecord::StatementInvalid, ActiveRecord::JDBCError
+        raise SchemaNotFound, "One of the following schema(s) is invalid: #{full_search_path}"
+      end
+
+      #   Create the new schema
+      #
+      def create_database(database)
+        Apartment.connection.execute(%{CREATE SCHEMA "#{database}"})
+
+      rescue ActiveRecord::StatementInvalid, ActiveRecord::JDBCError
+        raise SchemaExists, "The schema #{database} already exists."
+      end
+
+      private
+
+      #   Generate the final search path to set including persistent_schemas
+      #
+      def full_search_path
+        persistent_schemas = Apartment.persistent_schemas.join(', ')
+        @current_database.to_s + (persistent_schemas.empty? ? "" : ", #{persistent_schemas}")
+      end
+    end
+  end
+end

data/lib/apartment/database.rb

@@ -27,10 +27,19 @@ module Apartment
       Thread.current[:apartment_adapter] ||= begin
         adapter_method = "#{config[:adapter]}_adapter"
 
+        if defined?(JRUBY_VERSION)
+          if config[:adapter] =~ /mysql/
+            adapter_method = 'jdbc_mysql_adapter'
+          elsif config[:adapter] =~ /postgresql/
+            adapter_method = 'jdbc_postgresql_adapter'
+          end
+        end
+
         begin
+          require "apartment/adapters/abstract_jdbc_adapter" if defined?(JRUBY_VERSION)
           require "apartment/adapters/#{adapter_method}"
         rescue LoadError
-          raise "The adapter `#{config[:adapter]}` is not yet supported"
+          raise "The adapter `#{adapter_method}` is not yet supported"
         end
 
         unless respond_to?(adapter_method)
@@ -48,7 +57,7 @@ module Apartment
       @config = config
     end
 
-  private
+    private
 
     #   Fetch the rails database configuration
     #

data/lib/apartment/version.rb

@@ -1,3 +1,3 @@
 module Apartment
-  VERSION = "0.20.0"
+  VERSION = "0.21.0"
 end

data/spec/adapters/jdbc_mysql_adapter_spec.rb

@@ -0,0 +1,23 @@
+if defined?(JRUBY_VERSION)
+
+  require 'spec_helper'
+  require 'lib/apartment/adapters/jdbc_mysql_adapter'
+
+  describe Apartment::Adapters::JDBCMysqlAdapter do
+
+
+    let(:config) { Apartment::Test.config['connections']['mysql'] }
+    subject { Apartment::Database.jdbc_mysql_adapter config.symbolize_keys }
+
+    def database_names
+      ActiveRecord::Base.connection.execute("SELECT schema_name FROM information_schema.schemata").collect { |row| row['schema_name'] }
+    end
+
+    let(:default_database) { subject.process { ActiveRecord::Base.connection.current_database } }
+
+    it_should_behave_like "a generic apartment adapter"
+    it_should_behave_like "a connection based apartment adapter"
+
+  end
+
+end

data/spec/adapters/jdbc_postgresql_adapter_spec.rb

@@ -0,0 +1,43 @@
+if defined?(JRUBY_VERSION)
+
+  require 'spec_helper'
+  require 'lib/apartment/adapters/jdbc_postgresql_adapter'
+
+  describe Apartment::Adapters::JDBCPostgresqlAdapter do
+
+
+    let(:config) { Apartment::Test.config['connections']['postgresql'] }
+    subject { Apartment::Database.jdbc_postgresql_adapter config.symbolize_keys }
+
+    context "using schemas" do
+
+      before { Apartment.use_schemas = true }
+
+      # Not sure why, but somehow using let(:database_names) memoizes for the whole example group, not just each test
+      def database_names
+        ActiveRecord::Base.connection.execute("SELECT nspname FROM pg_namespace;").collect { |row| row['nspname'] }
+      end
+
+      let(:default_database) { subject.process { ActiveRecord::Base.connection.schema_search_path } }
+
+      it_should_behave_like "a generic apartment adapter"
+      it_should_behave_like "a schema based apartment adapter"
+    end
+
+    context "using databases" do
+
+      before { Apartment.use_schemas = false }
+
+      # Not sure why, but somehow using let(:database_names) memoizes for the whole example group, not just each test
+      def database_names
+        connection.execute("select datname from pg_database;").collect { |row| row['datname'] }
+      end
+
+      let(:default_database) { subject.process { ActiveRecord::Base.connection.current_database } }
+
+      it_should_behave_like "a generic apartment adapter"
+      it_should_behave_like "a connection based apartment adapter"
+
+    end
+  end
+end

data/spec/adapters/mysql2_adapter_spec.rb

@@ -2,46 +2,48 @@ require 'spec_helper'
 require 'apartment/adapters/mysql2_adapter'
 
 describe Apartment::Adapters::Mysql2Adapter do
+  unless defined?(JRUBY_VERSION)
 
-  let(:config){ Apartment::Test.config['connections']['mysql'].symbolize_keys }
-  subject(:adapter){ Apartment::Database.mysql2_adapter config }
+    let(:config){ Apartment::Test.config['connections']['mysql'].symbolize_keys }
+    subject(:adapter){ Apartment::Database.mysql2_adapter config }
 
-  def database_names
-    ActiveRecord::Base.connection.execute("SELECT schema_name FROM information_schema.schemata").collect{|row| row[0]}
-  end
+    def database_names
+      ActiveRecord::Base.connection.execute("SELECT schema_name FROM information_schema.schemata").collect { |row| row[0] }
+    end
 
-  let(:default_database){ subject.process{ ActiveRecord::Base.connection.current_database } }
+    let(:default_database) { subject.process { ActiveRecord::Base.connection.current_database } }
 
-  context "using - the equivalent of - schemas" do
-    before { Apartment.use_schemas = true }
+    context "using - the equivalent of - schemas" do
+      before { Apartment.use_schemas = true }
 
-    it_should_behave_like "a generic apartment adapter"
+      it_should_behave_like "a generic apartment adapter"
 
-    describe "#default_database" do
-      its(:default_database){ should == config[:database] }
-    end
+      describe "#default_database" do
+        its(:default_database){ should == config[:database] }
+      end
 
-    describe "#init" do
-      include Apartment::Spec::AdapterRequirements
+      describe "#init" do
+        include Apartment::Spec::AdapterRequirements
 
-      before do
-        Apartment.configure do |config|
-          config.excluded_models = ["Company"]
+        before do
+          Apartment.configure do |config|
+            config.excluded_models = ["Company"]
+          end
         end
-      end
 
-      it "should process model exclusions" do
-        Apartment::Database.init
+        it "should process model exclusions" do
+          Apartment::Database.init
 
-        Company.table_name.should == "#{default_database}.companies"
+          Company.table_name.should == "#{default_database}.companies"
+        end
       end
     end
-  end
 
-  context "using connections" do
-    before { Apartment.use_schemas = false }
+    context "using connections" do
+      before { Apartment.use_schemas = false }
 
-    it_should_behave_like "a generic apartment adapter"
-    it_should_behave_like "a connection based apartment adapter"
+      it_should_behave_like "a generic apartment adapter"
+      it_should_behave_like "a connection based apartment adapter"
+    end
   end
-end
+end

data/spec/adapters/postgresql_adapter_spec.rb

@@ -2,37 +2,39 @@ require 'spec_helper'
 require 'apartment/adapters/postgresql_adapter'
 
 describe Apartment::Adapters::PostgresqlAdapter do
+  unless defined?(JRUBY_VERSION)
 
-  let(:config){ Apartment::Test.config['connections']['postgresql'].symbolize_keys }
-  subject{ Apartment::Database.postgresql_adapter config }
+    let(:config){ Apartment::Test.config['connections']['postgresql'].symbolize_keys }
+    subject{ Apartment::Database.postgresql_adapter config }
 
-  context "using schemas" do
+    context "using schemas" do
 
-    before{ Apartment.use_schemas = true }
+      before{ Apartment.use_schemas = true }
 
-    # Not sure why, but somehow using let(:database_names) memoizes for the whole example group, not just each test
-    def database_names
-      ActiveRecord::Base.connection.execute("SELECT nspname FROM pg_namespace;").collect{|row| row['nspname']}
-    end
+      # Not sure why, but somehow using let(:database_names) memoizes for the whole example group, not just each test
+      def database_names
+        ActiveRecord::Base.connection.execute("SELECT nspname FROM pg_namespace;").collect { |row| row['nspname'] }
+      end
 
-    let(:default_database){ subject.process{ ActiveRecord::Base.connection.schema_search_path } }
+      let(:default_database) { subject.process { ActiveRecord::Base.connection.schema_search_path } }
 
-    it_should_behave_like "a generic apartment adapter"
-    it_should_behave_like "a schema based apartment adapter"
-  end
+      it_should_behave_like "a generic apartment adapter"
+      it_should_behave_like "a schema based apartment adapter"
+    end
 
-  context "using connections" do
+    context "using connections" do
 
-    before{ Apartment.use_schemas = false }
+      before{ Apartment.use_schemas = false }
 
-    # Not sure why, but somehow using let(:database_names) memoizes for the whole example group, not just each test
-    def database_names
-      connection.execute("select datname from pg_database;").collect{|row| row['datname']}
-    end
+      # Not sure why, but somehow using let(:database_names) memoizes for the whole example group, not just each test
+      def database_names
+        connection.execute("select datname from pg_database;").collect { |row| row['datname'] }
+      end
 
-    let(:default_database){ subject.process{ ActiveRecord::Base.connection.current_database } }
+      let(:default_database) { subject.process { ActiveRecord::Base.connection.current_database } }
 
-    it_should_behave_like "a generic apartment adapter"
-    it_should_behave_like "a connection based apartment adapter"
+      it_should_behave_like "a generic apartment adapter"
+      it_should_behave_like "a connection based apartment adapter"
+    end
   end
 end