penthouse 0.12.2 → 0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8c80eabcd8683ce926c3352a4c93d54f045eeb5
-  data.tar.gz: 80b98c6090bcab5595fa65417d79bfaa8ab5a5de
+  metadata.gz: ffc67c3cad093e9b85e263bf9da478a4ca754111
+  data.tar.gz: 4b4161ccc5d1013ec0edb784a51579a32084096b
 SHA512:
-  metadata.gz: 0165d7ce88345e0d096cddff925bc7d44618212f083b5e749af59b736326f2a6ee9f93420f735908a5b4b22f88452790a25e9b6b68f32031376a3b703bf4750e
-  data.tar.gz: b748fe21135a04cfd3d8e49e7a041ada4f4a9caca1a3fca2aa4a73f6413709099645cea81e0d6a4d0d6cd4a0863fca3859c6056f25697b88f4606fc078873454
+  metadata.gz: 2e905c8ae73db898fa693bba19a5583276524e885eabb41b7fab59c8ce44beed5fce83711423d73456e867abd9383f34a17cdbd9eec6468d16a786fe0990d56d
+  data.tar.gz: f74210fbf84efdc2e2de0854eddb3f0d042d6b4a7307768a86a4c69ccd29e75c0691d27d0d812313e76facb9eea65c8f078878879e7d509b7432a03afdeb0f68

data/lib/penthouse/tenants/migratable.rb

@@ -17,16 +17,60 @@ module Penthouse
         if File.exist?(db_schema_file)
           # run the migrations within this schema
           call do
-            # don't output all the log messages
-            ActiveRecord::Schema.verbose = false
-            # run the schema file to migrate this tenant
-            load(db_schema_file)
+            read_schema(db_schema_file)
           end
         else
           raise ArgumentError, "#{db_schema_file} does not exist"
         end
       end
 
+      private 
+
+      def read_schema(db_schema_file)
+        case db_schema_file.extname
+        when '.rb'
+          load_ruby_schema(db_schema_file)
+        when '.sql'
+          load_sql_schema(db_schema_file)
+        else
+          raise ArgumentError, "Unrecognized schema file extension"
+        end
+      end
+
+      def load_ruby_schema(db_schema_file)
+        # don't output all the log messages
+        ActiveRecord::Schema.verbose = false
+        # run the schema file to migrate this tenant
+        load(db_schema_file)
+      end
+
+      def load_sql_schema(db_schema_file)
+        sql = process_schema_file(db_schema_file)
+        
+        ActiveRecord::Base.transaction do
+          with_limited_logging { ActiveRecord::Base.connection.execute(sql) }
+        end
+      end
+
+      def with_limited_logging
+        temp_logger = Logger.new(STDOUT).tap { |l| l.level = Logger::ERROR }
+        current_logger = ActiveRecord::Base.logger
+
+        ActiveRecord::Base.logger = temp_logger
+        yield
+        ActiveRecord::Base.logger = current_logger
+      end
+
+      def process_schema_file(db_schema_file)
+        sql = File.read(db_schema_file)
+        sanitize_sql(sql)
+      end
+
+      def sanitize_sql(sql)
+        sql
+          .gsub(/SET search_path.*;/, '')
+          .gsub(/CREATE SCHEMA/, 'CREATE SCHEMA IF NOT EXISTS')
+      end
     end
   end
 end

data/lib/penthouse/version.rb

@@ -1,3 +1,3 @@
 module Penthouse
-  VERSION = "0.12.2"
+  VERSION = "0.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: penthouse
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: '0.13'
 platform: ruby
 authors:
 - Ryan Townsend
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-29 00:00:00.000000000 Z
+date: 2018-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler