apartment 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12cd184ff975b1b35f44289fb83ffc7a6a644035f90ea4c01fc93d249b814ef2
-  data.tar.gz: 448a27893a2ca2564d368c1ca7140582ddcedbb3f209f07f7a8b2e148bfd252e
+  metadata.gz: be448dd133ac9668f7ba463444dbf7ea92c12d844b3b87a319c2b380cc26d9a6
+  data.tar.gz: 36ad7e20ba2897f2696262c010295a2912c52a10050445971495fc3c452afd1f
 SHA512:
-  metadata.gz: ff5cdb7a876920cbf88f1f5d0cd9821b91de5e518a0eea3eae262552fc6ca1608227ce6f1d2d367f1dca8d97d660f081c61bf89a1ecf2709eb38f8c85582a251
-  data.tar.gz: b84c9287ca34937c46dfb6ec9746d6eadd27e81def1f0016b37281f8007a75092d2d58a4826f94da307bf4c75caf4b0b7d0725a478b3ec70c3b92dc8c4b8f5c0
+  metadata.gz: f4a32ff51228ad18573838b29980fe507df2856e23b3269f9eb0be8dcddd4a3e86e08c40038e45a21d41f884fa7e1c38ae570753ba40e7e21e512bf243a047e3
+  data.tar.gz: 42231f505295be8cd0babe3e58252867d1a6bc59ef5df3c9eacda2a80858ba8ba3d0fa584c73883986ab136b7611a865684c50f8bd540b6acc9a2f8b37cd90de

data/.travis.yml

@@ -1,12 +1,15 @@
+sudo: required
 language: ruby
+services:
+  - docker
 rvm:
+  - jruby-9.1.15.0
   - 2.1.9
   - 2.2.9
   - 2.3.6
   - 2.4.3
   - 2.5.0
   - ruby-head
-  - jruby-9.1.15.0
 gemfile:
   - gemfiles/rails_4_2.gemfile
   - gemfiles/rails_5_0.gemfile
@@ -15,6 +18,9 @@ gemfile:
   - gemfiles/rails_master.gemfile
 bundler_args: --without local
 before_install:
+  - sudo /etc/init.d/mysql stop
+  - sudo /etc/init.d/postgresql stop
+  - docker-compose up -d
   - gem install bundler -v '> 1.5.0'
 env:
   RUBY_GC_MALLOC_LIMIT: 90000000

data/HISTORY.md

@@ -1,3 +1,14 @@
+# 2.2.1
+  * June 19, 2019
+
+## Added
+  - #566: IGNORE_EMPTY_TENANTS environment variable to ignore empty tenants
+    warning. [Pysis868]
+
+## Fixed
+  - #586: Ignore `CREATE SCHEMA public` statement in pg dump [artemave]
+  - #549: Fix Postgres schema creation with dump SQL [ancorcruz]
+
 # 2.2.0
   * April 14, 2018
 

data/README.md

@@ -533,6 +533,31 @@ end
 
 See [apartment-sidekiq](https://github.com/influitive/apartment-sidekiq) or [apartment-activejob](https://github.com/influitive/apartment-activejob).
 
+## Callbacks
+
+You can execute callbacks when switching between tenants or creating a new one, Apartment provides the following callbacks:
+
+- before_create
+- after_create
+- before_switch
+- after_switch
+
+You can register a callback using [ActiveSupport::Callbacks](https://api.rubyonrails.org/classes/ActiveSupport/Callbacks.html) the following way:
+
+```ruby
+require 'apartment/adapters/abstract_adapter'
+
+module Apartment
+  module Adapters
+    class AbstractAdapter
+      set_callback :switch, :before do |object|
+        ...
+      end
+    end
+  end
+end
+```
+
 ## Contributing
 
 * In both `spec/dummy/config` and `spec/config`, you will see `database.yml.sample` files

data/docker-compose.yml

@@ -1,14 +1,33 @@
-version: '2'
+version: '2.3'
 services:
   postgresql:
-    image: postgres:10.3
+    image: postgres:9.5.12
     environment:
       POSTGRES_PASSWORD: ""
     ports:
       - "5432:5432"
+    healthcheck:
+      test: pg_isready -U postgres
+      start_period: 10s
+      interval: 10s
+      timeout: 30s
+      retries: 3
   mysql:
     image: mysql:5.7
     environment:
       MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
     ports:
       - "3306:3306"
+    healthcheck:
+      test: mysqladmin -h 127.0.0.1 -uroot ping
+      start_period: 15s
+      interval: 10s
+      timeout: 30s
+      retries: 3
+  healthcheck:
+    image: busybox
+    depends_on:
+      postgresql:
+        condition: service_healthy
+      mysql:
+        condition: service_healthy

data/lib/apartment/adapters/abstract_adapter.rb

@@ -120,6 +120,25 @@ module Apartment
       end
       alias_method :seed, :seed_data
 
+      #   Prepend the environment if configured and the environment isn't already there
+      #
+      #   @param {String} tenant Database name
+      #   @return {String} tenant name with Rails environment *optionally* prepended
+      #
+      def environmentify(tenant)
+        unless tenant.include?(Rails.env)
+          if Apartment.prepend_environment
+            "#{Rails.env}_#{tenant}"
+          elsif Apartment.append_environment
+            "#{tenant}_#{Rails.env}"
+          else
+            tenant
+          end
+        else
+          tenant
+        end
+      end
+
     protected
 
       def process_excluded_model(excluded_model)
@@ -163,25 +182,6 @@ module Apartment
         raise_connect_error!(tenant, exception)
       end
 
-      #   Prepend the environment if configured and the environment isn't already there
-      #
-      #   @param {String} tenant Database name
-      #   @return {String} tenant name with Rails environment *optionally* prepended
-      #
-      def environmentify(tenant)
-        unless tenant.include?(Rails.env)
-          if Apartment.prepend_environment
-            "#{Rails.env}_#{tenant}"
-          elsif Apartment.append_environment
-            "#{tenant}_#{Rails.env}"
-          else
-            tenant
-          end
-        else
-          tenant
-        end
-      end
-
       #   Import the database schema
       #
       def import_database_schema

data/lib/apartment/adapters/postgresql_adapter.rb

@@ -110,6 +110,9 @@ module Apartment
         /SET lock_timeout/i,                          # new in postgresql 9.3
         /SET row_security/i,                          # new in postgresql 9.5
         /SET idle_in_transaction_session_timeout/i,   # new in postgresql 9.6
+        /CREATE SCHEMA public/i,
+        /COMMENT ON SCHEMA public/i,
+
       ]
 
       def import_database_schema
@@ -204,7 +207,7 @@ module Apartment
           if Apartment.pg_excluded_names.any? { |name| match.include? name }
             match
           else
-            match.gsub(default_tenant, %{"#{current}"})
+            match.gsub("#{default_tenant}.", %{"#{current}".})
           end
         end
       end

data/lib/apartment/tenant.rb

@@ -8,7 +8,7 @@ module Apartment
     extend self
     extend Forwardable
 
-    def_delegators :adapter, :create, :drop, :switch, :switch!, :current, :each, :reset, :set_callback, :seed, :current_tenant, :default_tenant
+    def_delegators :adapter, :create, :drop, :switch, :switch!, :current, :each, :reset, :set_callback, :seed, :current_tenant, :default_tenant, :environmentify
 
     attr_writer :config
 

data/lib/apartment/version.rb

@@ -1,3 +1,3 @@
 module Apartment
-  VERSION = "2.2.0"
+  VERSION = "2.2.1"
 end

data/lib/tasks/apartment.rake

@@ -130,7 +130,7 @@ apartment_namespace = namespace :apartment do
   end
 
   def warn_if_tenants_empty
-    if tenants.empty?
+    if tenants.empty? && ENV['IGNORE_EMPTY_TENANTS'] != "true"
       puts <<-WARNING
         [WARNING] - The list of tenants to migrate appears to be empty. This could mean a few things:
 

data/spec/config/database.yml.sample

@@ -9,6 +9,8 @@ connections:
     url: jdbc:postgresql://localhost:5432/apartment_postgresql_test
     timeout: 5000
     pool: 5
+    host: localhost
+    port: 5432
 
   mysql:
     adapter: mysql
@@ -19,6 +21,8 @@ connections:
     url: jdbc:mysql://localhost:3306/apartment_mysql_test
     timeout: 5000
     pool: 5
+    host: 127.0.0.1
+    port: 3306
 <% else %>
 connections:
   postgresql:
@@ -28,12 +32,16 @@ connections:
     username: postgres
     schema_search_path: public
     password:
+    host: localhost
+    port: 5432
 
   mysql:
     adapter: mysql2
     database: apartment_mysql_test
     username: root
     password:
+    host: 127.0.0.1
+    port: 3306
 
   sqlite:
     adapter: sqlite3

data/spec/dummy/config/database.yml.sample

@@ -29,6 +29,8 @@ test:
   min_messages: WARNING
   pool: 5
   timeout: 5000
+  host: localhost
+  port: 5432
 
 development:
   adapter: postgresql
@@ -37,4 +39,6 @@ development:
   min_messages: WARNING
   pool: 5
   timeout: 5000
+  host: localhost
+  port: 5432
 <% end %>

data/spec/dummy/db/migrate/20180415260934_create_public_tokens.rb

@@ -0,0 +1,13 @@
+migration_class = (ActiveRecord::VERSION::MAJOR >= 5) ?  ActiveRecord::Migration[4.2] : ActiveRecord::Migration
+class CreatePublicTokens < migration_class
+  def up
+    create_table :public_tokens do |t|
+      t.string :token
+      t.integer :user_id, foreign_key: true
+    end
+  end
+
+  def down
+    drop_table :public_tokens
+  end
+end

data/spec/dummy/db/schema.rb

@@ -1,4 +1,3 @@
-# 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.
@@ -9,41 +8,48 @@
 # 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 to check this file into your version control system.
+# It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20111202022214) do
+ActiveRecord::Schema.define(version: 2018_04_15_260934) do
 
-  create_table "books", :force => true do |t|
-    t.string   "name"
-    t.integer  "pages"
+  # These are extensions that must be enabled in order to support this database
+  enable_extension "plpgsql"
+
+  create_table "books", force: :cascade do |t|
+    t.string "name"
+    t.integer "pages"
     t.datetime "published"
   end
 
-  create_table "companies", :force => true do |t|
+  create_table "companies", force: :cascade do |t|
     t.boolean "dummy"
-    t.string  "database"
+    t.string "database"
   end
 
-  create_table "delayed_jobs", :force => true do |t|
-    t.integer  "priority",   :default => 0
-    t.integer  "attempts",   :default => 0
-    t.text     "handler"
-    t.text     "last_error"
+  create_table "delayed_jobs", force: :cascade do |t|
+    t.integer "priority", default: 0
+    t.integer "attempts", default: 0
+    t.text "handler"
+    t.text "last_error"
     t.datetime "run_at"
     t.datetime "locked_at"
     t.datetime "failed_at"
-    t.string   "locked_by"
+    t.string "locked_by"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "queue"
+    t.string "queue"
+    t.index ["priority", "run_at"], name: "delayed_jobs_priority"
   end
 
-  add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
+  create_table "public_tokens", id: :serial, force: :cascade do |t|
+    t.string "token"
+    t.integer "user_id"
+  end
 
-  create_table "users", :force => true do |t|
-    t.string   "name"
+  create_table "users", force: :cascade do |t|
+    t.string "name"
     t.datetime "birthdate"
-    t.string   "sex"
+    t.string "sex"
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apartment
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Ryan Brunner
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-13 00:00:00.000000000 Z
+date: 2019-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -272,6 +272,7 @@ files:
 - spec/dummy/config/routes.rb
 - spec/dummy/db/migrate/20110613152810_create_dummy_models.rb
 - spec/dummy/db/migrate/20111202022214_create_table_books.rb
+- spec/dummy/db/migrate/20180415260934_create_public_tokens.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/seeds.rb
 - spec/dummy/db/seeds/import.rb
@@ -359,7 +360,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: A Ruby gem for managing database multitenancy
@@ -396,6 +397,7 @@ test_files:
 - spec/dummy/config/routes.rb
 - spec/dummy/db/migrate/20110613152810_create_dummy_models.rb
 - spec/dummy/db/migrate/20111202022214_create_table_books.rb
+- spec/dummy/db/migrate/20180415260934_create_public_tokens.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/seeds.rb
 - spec/dummy/db/seeds/import.rb