pg_shrink 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 020bdbd21742730e6116d22053802378b25aabc2
-  data.tar.gz: 626257ce75eeb12f13ec0207052e217dc0429954
+  metadata.gz: 91758d0f6d6dda346377c31c7e26739d44d209ed
+  data.tar.gz: 3456597445c2de0dcd3a6d956673ddac607b331d
 SHA512:
-  metadata.gz: 1aa6aecd642ff837ca77d91b4a80f3e540c59b9e1df8137dfb0c43929d46290c22ed3b1d5c737dd707d5cc118eab733276ceee1e14f63f8b8c26a322e3aceef8
-  data.tar.gz: 360fef93069129daacfd2cdeeb287b63a45709eea6b1bfe5f22c05b9dc58f28aaddb868a27878fe970a1d9ba78e3001e27ecb8e2a1eabf6aaf008a3a5515b5e4
+  metadata.gz: bf159b0db40e195a2a1caaabf7fd37e8a98eb415ade6ebaaa4258b7e7f1ccc21ed2f8ff3c45fd6388d56fcd2f0528cf68088b80dcfd3a65cac3283773e40fc3d
+  data.tar.gz: 10a7d63d18ab1a5cf52510b0cd6a4699def302188d53950256e7aa90808da92d80463e5795083ae2f3c5aae0f620f7af80ccb021584f0725091cac02d0e615eb

data/lib/pg_shrink.rb

@@ -22,21 +22,37 @@ module PgShrink
     }
   end
 
-  def self.valid_pg_url?(url)
+  def self.validate_pg_url!(url)
+    if url.blank?
+      abort("Error loading postgres: " +
+            "Please specify postgres url using -u <postgres_url>")
+    end
     uri = URI.parse(url)
-    uri.scheme == 'postgres' && !uri.user.blank? && uri.path != '/'
+    if uri.scheme == 'postgres' && !uri.user.blank? && uri.path != '/'
+      return true
+    else
+      abort("Error loading postgres: " +
+            "#{url} is not a valid postgres url")
+    end
   rescue => ex
-    false
+    abort(
+      "Error loading postgres: " +
+      "#{url} is not a valid postgres url"
+    )
   end
 
   def self.run(options)
     unless File.exists?(options[:config])
-      raise "Could not find file: #{options[:config]}"
+      if options[:config] == 'Shrinkfile'
+        abort("Error loading Shrinkfile: " +
+              "Please specify location using -c <path/to/Shrinkfile>")
+      else
+        abort("Error loading Shrinkfile: " +
+              "Could not find file at: #{options[:config]}")
+      end
     end
 
-    unless valid_pg_url?(options[:url])
-      raise "Invalid postgres url: #{options[:url]}"
-    end
+    validate_pg_url!(options[:url])
 
     database = Database::Postgres.new(:postgres_url => options[:url])
 
@@ -49,8 +65,7 @@ module PgShrink
       cont = gets
       cont = cont.strip
       unless cont == 'y' || cont == 'Y'
-        puts 'Aborting!'
-        exit 1
+        abort('Aborting!')
       end
     end
 

data/lib/pg_shrink/database.rb

@@ -17,8 +17,9 @@ module PgShrink
       yield table if block_given?
     end
 
-    def remove_table(table_name)
+    def remove_table(table_name, opts = {})
       table = self.table(table_name)
+      table.update_options(opts)
       table.mark_for_removal!
     end
 

data/lib/pg_shrink/database/postgres.rb

@@ -41,6 +41,9 @@ module PgShrink
     def records_in_batches(table_name)
       table = self.table(table_name)
       primary_key = table.primary_key
+      unless primary_key
+        raise "Error:  Records in batches called on table without a primary key"
+      end
       max_id = self.connection["select max(#{primary_key}) from #{table_name}"].
                     first[:max]
       i = 1;

data/lib/pg_shrink/sub_table_filter.rb

@@ -2,6 +2,7 @@ module PgShrink
   class SubTableFilter < SubTableOperator
 
     def propagate!(old_parent_data, new_parent_data)
+      return if (old_parent_data.empty? && new_parent_data.empty?)
       old_batch_keys = old_parent_data.map {|record| record[@opts[:primary_key]]}
       new_batch_keys = new_parent_data.map {|record| record[@opts[:primary_key]]}
 

data/lib/pg_shrink/sub_table_sanitizer.rb

@@ -9,6 +9,7 @@ module PgShrink
     end
 
     def propagate!(old_parent_data, new_parent_data)
+      return if (old_parent_data.empty? && new_parent_data.empty?)
       old_batch = old_parent_data.index_by {|record| record[@opts[:primary_key]]}
       new_batch = new_parent_data.index_by {|record| record[@opts[:primary_key]]}
 

data/lib/pg_shrink/table.rb

@@ -60,7 +60,9 @@ module PgShrink
       if primary_key
         deleted_keys = old_records.map {|r| r[primary_key]} -
                        new_records.map {|r| r[primary_key]}
-        self.database.delete_records(table_name, primary_key => deleted_keys)
+        if deleted_keys.any?
+          self.database.delete_records(table_name, primary_key => deleted_keys)
+        end
       else
         # TODO:  Do we need to speed this up?  Or is this an unusual enough
         # case that we can leave it slow?
@@ -120,10 +122,14 @@ module PgShrink
     end
 
     def filter!
-      self.filters.each do |filter|
-        self.records_in_batches do |batch|
-          self.filter_batch(batch) do |record|
-            filter.apply(record)
+      if remove? && can_just_remove?
+        remove!
+      else
+        self.filters.each do |filter|
+          self.records_in_batches do |batch|
+            self.filter_batch(batch) do |record|
+              filter.apply(record)
+            end
           end
         end
       end
@@ -139,12 +145,26 @@ module PgShrink
       end
     end
 
-    # We use a filter for this, so that all other dependencies etc behave
-    # as would be expected.
+    def can_just_remove?
+      self.subtable_filters.empty? && self.subtable_sanitizers.empty? && !@lock
+    end
+
+    # Mark @remove and add filter so that if we're in the simple case we can
+    # just remove! and if not we can just go through filters and all
+    # dependencies will be handled
     def mark_for_removal!
+      @remove = true
       self.filter_by { false }
     end
 
+    def remove?
+      !!@remove
+    end
+
+    def remove!
+      self.database.delete_records(table_name, {})
+    end
+
     # Check explicitly for nil because we want to be able to set primary_key
     # to false for e.g. join tables
     def primary_key

data/lib/pg_shrink/version.rb

@@ -1,3 +1,3 @@
 module PgShrink
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/pg_config.example.yml

@@ -0,0 +1,6 @@
+test:
+  database: test_pg_shrink
+  user: postgres
+  password:
+  host: localhost
+  port:

data/spec/pg_shrink/database/postgres_spec.rb

@@ -81,6 +81,28 @@ describe PgShrink::Database::Postgres do
         db.filter!
         expect(db.connection["select * from test_table"].all.size).to eq(0)
       end
+      describe "on a table with no primary key" do
+        before(:all) do
+          PgSpecHelper.create_table(db.connection, :no_primary_key,
+                              {'name' => 'character(128)',
+                               'test' => 'integer'}, nil)
+        end
+        before(:each) do
+          (1..20).each do |i|
+            db.connection.run(
+              "insert into no_primary_key (name, test) values ('test', #{i})"
+            )
+        end
+
+        end
+
+        it "can still remove the whole table" do
+          db.remove_table(:no_primary_key, :primary_key => false)
+          db.filter!
+          expect(db.connection["select * from no_primary_key"].all.size).to eq(0)
+
+          end
+      end
     end
   end
 end

data/spec/pg_shrink/table_spec.rb

@@ -88,7 +88,7 @@ describe PgShrink::Table do
 
   context "when a subtable filter is specified" do
     let(:database) {PgShrink::Database.new}
-    let(:table) { PgShrink::Table.new(database, :test_table) }
+    let(:table) { PgShrink::Table.new(database, :test_table, :primary_key => false) }
 
     before(:each) do
       table.filter_subtable(:subtable)
@@ -133,12 +133,8 @@ describe PgShrink::Table do
       table.mark_for_removal!
     end
 
-    it "should by default remove all" do
-      expect(table).to receive(:records_in_batches).and_yield(test_data)
-      expect(table).to receive(:delete_records) do |old_batch, new_batch|
-        expect(old_batch).to eq(test_data)
-        expect(new_batch).to eq([])
-      end
+    it "should run remove! if there are no dependencies" do
+      expect(table).to receive(:remove!)
       table.shrink!
     end
 

data/spec/pg_shrink_spec.rb

@@ -47,6 +47,14 @@ describe PgShrink do
           end
         end
 
+        it "Should not run delete if there is nothing filtered" do
+          database.filter_table(:users) do |f|
+            f.filter_by {true}
+          end
+          expect(database).not_to receive(:delete_records)
+          database.shrink!
+        end
+
         describe "with a test shrinkfile" do
           let(:shrinkfile) {"spec/Shrinkfile.basic"}
           let(:url) {database.connection_string}

data/spec/pg_spec_helper.rb

@@ -15,7 +15,12 @@ module PgSpecHelper
   end
 
   def self.pg_config
-    @pg_config ||= YAML.load_file('spec/pg_config.yml')['test']
+    @pg_config ||= if File.exists?('spec/pg_config.yml')
+      YAML.load_file('spec/pg_config.yml')['test']
+    else
+      {"database"=>"test_pg_shrink", "user"=>"postgres", "password"=>nil,
+       "host"=>"localhost", "port"=>nil}
+    end
   end
 
   def self.drop_table_if_exists(connection, table)

metadata

@@ -1,195 +1,195 @@
 --- !ruby/object:Gem::Specification
 name: pg_shrink
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Kevin Ball
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-29 00:00:00.000000000 Z
+date: 2014-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-nc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-remote
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-nav
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: pg_shrink makes it simple to shrink and sanitize a psql database
@@ -200,8 +200,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
+- .gitignore
+- .rspec
 - Gemfile
 - Guardfile
 - README.md
@@ -220,7 +220,7 @@ files:
 - lib/pg_shrink/version.rb
 - pg_shrink.gemspec
 - spec/Shrinkfile.basic
-- spec/pg_config.yml
+- spec/pg_config.example.yml
 - spec/pg_shrink/database/postgres_spec.rb
 - spec/pg_shrink/database_spec.rb
 - spec/pg_shrink/table_spec.rb
@@ -237,23 +237,23 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: ''
 test_files:
 - spec/Shrinkfile.basic
-- spec/pg_config.yml
+- spec/pg_config.example.yml
 - spec/pg_shrink/database/postgres_spec.rb
 - spec/pg_shrink/database_spec.rb
 - spec/pg_shrink/table_spec.rb