data_keeper 0.1.1 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 268e784853f728ad8c4cefd36ca8cc2f09b2892ab8751f1eb0f16dc17bc72900
-  data.tar.gz: 62ea9b6a3bf57ae952417db4fd149365f56f4baf63f67839bde26d3d2f352464
+  metadata.gz: 2fc356b01f1619f2ec815a556092bd13fc28b44b2b201707c6a820da00fcff70
+  data.tar.gz: 8f2d4dcc59035b7fee1131daa3cfed6dedb0bf5c635e781d48dc65c7c43a58e7
 SHA512:
-  metadata.gz: 8ea7c0182fb8698c7d9c2be973cf7d3def1845222027feb90107adda8d333488ef01318268f8ae1356c2bd45d89419cb908443b5a9037df359cf5fc63376fca7
-  data.tar.gz: 7110186baac099fe5ce341186b25594c4ad730a811bc4270c4cd8e1d14d3cf4858bce5eb8bed0e621152da6d5729223c4d47c4f74b8e558c9539bb5bfcecd0c1
+  metadata.gz: 5102f1e716045e8bc425d69c71b03c8cad46b805d3caf7db12a0eb9ff073f53c1c94cebfd70a9909b8d806f543c66e1ecd7f3c3d3d344a688bacf8bdf6d2f3f5
+  data.tar.gz: 0b4459b6441c79cb3768fa769271ccb7661f458cf4f69b75562a4fc92ebfa2e28502bf294102689112b399cf97938c25ee703775444132f39c2a38e6d402bfa4

data/README.md

@@ -46,6 +46,9 @@ DataKeeper.storage = DataKeeper::LocalStorage.new(
 There's also support for storing the dumps in s3, using `DataKeeper::S3Storage` like in this example:
 
 ```ruby
+# Explicit require is necessary
+require 'data_keeper/s3_storage'
+
 DataKeeper.storage = DataKeeper::S3Storage.new(
   bucket: 'bucket-name',
   store_dir: 'dumps/',

data/lib/data_keeper/definition.rb

@@ -26,21 +26,19 @@ module DataKeeper
   end
 
   class DefinitionBuilder
-    attr_reader :tables, :raw_sqls, :on_after_load_block
+    def initialize(type, definition_block)
+      raise InvalidDumpType, "Invalid type! use :partial or :full" unless [:partial, :full].include?(type)
 
-    def initialize(definition_block)
+      @type = type
       @tables = []
       @raw_sqls = {}
-      instance_eval(&definition_block) if definition_block
+      @definition_block = definition_block
     end
 
-    def self.build(type, block)
-      @type = type
-      raise InvalidDumpType, "Invalid type! use :partial or :full" unless [:partial, :full].include?(type)
-
-      builder = new(block)
+    def evaluate!
+      instance_eval(&@definition_block) if @definition_block
 
-      Definition.new(type, builder.tables, builder.raw_sqls, builder.on_after_load_block)
+      Definition.new(@type, @tables, @raw_sqls, @on_after_load_block)
     end
 
     def table(name)

data/lib/data_keeper/dumper.rb

@@ -35,7 +35,7 @@ module DataKeeper
           output_path: file.path
         )
 
-        yield file, "#{filename}.dump"
+        yield File.open(file.path), "#{filename}.dump"
       end
     end
 
@@ -51,7 +51,7 @@ module DataKeeper
           end
         end
 
-        yield file, "#{filename}.tar.gz"
+        yield File.open(file.path), "#{filename}.tar.gz"
       end
     end
 

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!
@@ -24,6 +27,8 @@ module DataKeeper
     private
 
     def load_full_database!
+      ensure_schema_compatibility!
+
       pg_restore = Terrapin::CommandLine.new(
         'pg_restore',
         "#{connection_args} -j 4 --no-owner --dbname #{database} #{@file.path} 2>/dev/null",
@@ -52,9 +57,11 @@ module DataKeeper
 
     def load_partial_database!
       inflate(@file.path) do |schema_path, tables_path, sql_files|
+        ensure_schema_compatibility!
+
         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 --dbname :database #{schema_path} 2>/dev/null",
           environment: psql_env
         )
 
@@ -66,7 +73,7 @@ module DataKeeper
 
         pg_restore = Terrapin::CommandLine.new(
           'pg_restore',
-          "#{connection_args} -c -j 4 --no-owner --dbname #{database} #{tables_path} 2>/dev/null",
+          "#{connection_args} --data-only -j 4 --no-owner --disable-triggers --dbname :database #{tables_path} 2>/dev/null",
           environment: psql_env
         )
 
@@ -88,7 +95,7 @@ module DataKeeper
             host: host,
             port: port,
             csv_path: csv_path,
-            command: "COPY #{table} FROM stdin DELIMITER ',' CSV HEADER"
+            command: "ALTER TABLE #{table} DISABLE TRIGGER all; COPY #{table} FROM stdin DELIMITER ',' CSV HEADER"
           )
         end
 
@@ -96,6 +103,20 @@ module DataKeeper
       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
+
     class InflatedFiles
       attr_reader :errors
 

data/lib/data_keeper/version.rb

@@ -1,3 +1,3 @@
 module DataKeeper
-  VERSION = "0.1.1"
+  VERSION = "0.1.5"
 end

data/lib/data_keeper.rb

@@ -15,18 +15,20 @@ module DataKeeper
   DumpDoesNotExist = Class.new(Error)
   NoStorageDefined = Class.new(Error)
 
-  @dumps = {}
+  @dump_definition_builders = {}
   @storage = nil
 
   def self.define_dump(name, type = :partial, &block)
-    @dumps[name.to_sym] = DefinitionBuilder.build(type, block)
+    @dump_definition_builders[name.to_sym] = DefinitionBuilder.new(type, block)
   end
 
   def self.create_dump!(name)
     raise DumpDoesNotExist unless dump?(name)
     raise NoStorageDefined if @storage.nil?
 
-    Dumper.new(name, @dumps[name.to_sym]).run! do |file, filename|
+    definition = @dump_definition_builders[name.to_sym].evaluate!
+
+    Dumper.new(name, definition).run! do |file, filename|
       @storage.save(file, filename, name)
     end
   end
@@ -34,9 +36,10 @@ module DataKeeper
   def self.fetch_and_load_dump!(name)
     raise DumpDoesNotExist unless dump?(name)
     raise NoStorageDefined if @storage.nil?
+    definition = @dump_definition_builders[name.to_sym].evaluate!
 
     @storage.retrieve(name) do |file|
-      Loader.new(@dumps[name.to_sym], file).load!
+      Loader.new(definition, file).load!
     end
   end
 
@@ -44,11 +47,12 @@ module DataKeeper
     raise DumpDoesNotExist unless File.file?(path)
     raise NoStorageDefined if @storage.nil?
 
-    Loader.new(@dumps[name.to_sym], File.open(path)).load!
+    definition = @dump_definition_builders[name.to_sym].evaluate!
+    Loader.new(definition, File.open(path)).load!
   end
 
   def self.dump?(name)
-    @dumps.key?(name.to_sym)
+    @dump_definition_builders.key?(name.to_sym)
   end
 
   def self.storage=(value)
@@ -56,6 +60,6 @@ module DataKeeper
   end
 
   def self.clear_dumps!
-    @dumps = {}
+    @dump_definition_builders = {}
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: data_keeper
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.5
 platform: ruby
 authors:
 - Roger Campos
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-16 00:00:00.000000000 Z
+date: 2021-09-02 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