data_keeper 0.1.2 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 246804bd313245cf8d56ab51d8784545efa1985af2303ec3827a7db48a0b8401
-  data.tar.gz: 1833267238192680890e3f021fc6cfc67a0677567df97517eb65a59680bb38e1
+  metadata.gz: 281f71c099696e1d51c88dd57e2cd0edf5f028bbbf4340c4457923e3a17b553a
+  data.tar.gz: 1592db229f9407735630803bff1a97bd85ed051ec30b878029952ffcfb272759
 SHA512:
-  metadata.gz: fb3182638b4eb1713a6d567051e6c66f90aa0c25c247d8e5e6250525525721a893f74838ed8754b34d3bf957a47d22678e067992157e731bb7b68e74e6bdbb75
-  data.tar.gz: 26a5cadb9d451db4af9069167b9fb605f6dbbc545e623d5d3eeb42d3360120688d9f6767332e93df2b5cb0fc343e105b4209e899ff2bbd91037330790b8782ab
+  metadata.gz: cf10459525a1cd3f210c6ef926b2b6d87a217505c8d8c8c155e99021d7a8837312fbf0038302987a683bf2a66f335d7507071451eff213ce004536ea42d26ca9
+  data.tar.gz: 30ff5218bb48851d938b96afba015e9076226b25342171e35ac47b5d78ecc8d8c3308afc2ffd6a94ded725495303da9a65f4394530a63cb193fcf005a90d4952

data/.gitignore

@@ -6,5 +6,6 @@
 /pkg/
 /spec/reports/
 /tmp/
+/lib/tmp
 
 Gemfile.lock

data/Gemfile

@@ -5,3 +5,4 @@ gemspec
 
 gem "rake", "~> 12.0"
 gem "minitest", "~> 5.0"
+gem 'pg'

data/lib/data_keeper/database_config.rb

@@ -1,7 +1,7 @@
 module DataKeeper
   module DatabaseConfig
     def database_connection_config
-      Rails.configuration.database_configuration[Rails.env]
+      @database_connection_config ||= DataKeeper.database_config.call
     end
 
     def psql_env

data/lib/data_keeper/definition.rb

@@ -33,6 +33,7 @@ module DataKeeper
       @tables = []
       @raw_sqls = {}
       @definition_block = definition_block
+      @on_after_load_block = nil
     end
 
     def evaluate!

data/lib/data_keeper/loader.rb

@@ -7,6 +7,9 @@ module DataKeeper
     def initialize(dump, file)
       @dump = dump
       @file = file
+      @psql_version = Terrapin::CommandLine.new('psql', '--version').run
+                                           .match(/[0-9]{1,}\.[0-9]{1,}/)
+                                           .to_s.to_f
     end
 
     def load!
@@ -17,44 +20,66 @@ module DataKeeper
       end
 
       if @dump.on_after_load_block
+        ActiveRecord::Base.establish_connection
         @dump.on_after_load_block.call
       end
     end
 
     private
 
-    def load_full_database!
-      pg_restore = Terrapin::CommandLine.new(
-        'pg_restore',
-        "#{connection_args} -j 4 --no-owner --dbname #{database} #{@file.path} 2>/dev/null",
+    def log_redirect
+      if Terrapin::CommandLine.logger
+        ""
+      else
+        "  2>/dev/null"
+      end
+    end
+
+    def set_ar_internal_metadata!
+      cmd = Terrapin::CommandLine.new(
+        'psql',
+        "#{connection_args} -d :database -c :sql",
         environment: psql_env
       )
 
-      pg_restore.run(
+      cmd.run(
         database: database,
         host: host,
-        port: port
+        port: port,
+        sql: "DELETE from ar_internal_metadata"
       )
 
-      cmd = Terrapin::CommandLine.new(
-        'psql',
-        "#{connection_args} -d :database -c :sql",
+      cmd.run(
+        database: database,
+        host: host,
+        port: port,
+        sql: "INSERT into ar_internal_metadata (key, value, created_at, updated_at) VALUES ('environment', 'development', '2020-04-03 12:25:54.094209', '2020-04-03 12:25:54.094209')"
+      )
+    end
+
+    def load_full_database!
+      ensure_schema_compatibility!
+
+      pg_restore = Terrapin::CommandLine.new(
+        'pg_restore',
+        "#{connection_args} -j 4 --no-owner --dbname #{database} #{@file.path}#{log_redirect}",
         environment: psql_env
       )
 
-      cmd.run(
+      pg_restore.run(
         database: database,
         host: host,
-        port: port,
-        sql: "UPDATE ar_internal_metadata SET value = 'development'"
+        port: port
       )
+
+      set_ar_internal_metadata!
     end
 
     def load_partial_database!
       inflate(@file.path) do |schema_path, tables_path, sql_files|
         pg_restore = Terrapin::CommandLine.new(
           'pg_restore',
-          "#{connection_args} -j 4 --no-owner --dbname :database #{schema_path} 2>/dev/null",
+          "#{connection_args} -j 4 --no-owner -s --dbname :database #{schema_path}#{log_redirect}",
           environment: psql_env
         )
 
@@ -66,7 +91,7 @@ module DataKeeper
 
         pg_restore = Terrapin::CommandLine.new(
           'pg_restore',
-          "#{connection_args} --data-only -j 4 --no-owner --disable-triggers --dbname :database #{tables_path} 2>/dev/null",
+          "#{connection_args} --data-only -j 4 --no-owner --disable-triggers --dbname :database #{tables_path}#{log_redirect}",
           environment: psql_env
         )
 
@@ -92,7 +117,21 @@ module DataKeeper
           )
         end
 
-        Rake::Task['db:environment:set'].invoke
+        set_ar_internal_metadata!
+      end
+    end
+
+    def ensure_schema_compatibility!
+      cmd = Terrapin::CommandLine.new(
+        'psql',
+        "#{connection_args} -d :database -c :command",
+        environment: psql_env
+      )
+
+      if @psql_version >= 11.0
+        cmd.run(database: database, host: host, port: port, command: "drop schema if exists public")
+      else
+        cmd.run(database: database, host: host, port: port, command: "create schema if not exists public")
       end
     end
 

data/lib/data_keeper/version.rb

@@ -1,3 +1,3 @@
 module DataKeeper
-  VERSION = "0.1.2"
+  VERSION = "0.1.6"
 end

data/lib/data_keeper.rb

@@ -17,6 +17,7 @@ module DataKeeper
 
   @dump_definition_builders = {}
   @storage = nil
+  @database_config = -> { Rails.configuration.database_configuration[Rails.env] }
 
   def self.define_dump(name, type = :partial, &block)
     @dump_definition_builders[name.to_sym] = DefinitionBuilder.new(type, block)
@@ -59,6 +60,14 @@ module DataKeeper
     @storage = value
   end
 
+  def self.database_config=(value)
+    @database_config = value
+  end
+
+  def self.database_config
+    @database_config
+  end
+
   def self.clear_dumps!
     @dump_definition_builders = {}
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: data_keeper
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.6
 platform: ruby
 authors:
 - Roger Campos
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-23 00:00:00.000000000 Z
+date: 2021-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Easy management of database dumps for dev env