sliding_partition 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bf2b1b4f2a76d444d0238530ae8eb2be574c566
-  data.tar.gz: 97ae79b822ca5e4212d53e18e90976d78029e1aa
+  metadata.gz: f9916b72faca0f3568f5053076bff0f27629fc8c
+  data.tar.gz: dbe0c196c037d676770a56a9da7703f799f7db2a
 SHA512:
-  metadata.gz: 6c076eee13cd511d8f74788e7462cf05ef7835ad92d943d0252d7ddb4b2d09f1cf8d3e63e118f958fa76461ed4e883873a2e56416d8e64b18fe52186e1bcf224
-  data.tar.gz: 250ce476eed36ef530ef28ed3af7d0084ef3c2c95acfce42d7a87647caf8b623fb98ee2c7a238d668abf78fd936ea4687a1846340388b06372167559d77eb0c1
+  metadata.gz: 208f6b59ee67f39c3068327b2356834a845a66ec29c7ec5690b78d6a1bf10d635dfb3d7f0ebf097ea41084684d9938478db1739abf9be125cad932407d96a5e5
+  data.tar.gz: f61305d57f5dfc532d0c7b5b11d66c3c2c1284bc1f50c5b172513251f4a0e89c09ef59272d463a138d5c5ec8d9765ee14ddd5adbecf0f253a8cca002f94e281d

data/README.md

@@ -16,7 +16,6 @@
 - [Setup](#setup)
 - [Usage](#usage)
   - [Rails](#rails)
-- [config/sliding_partitions.rb](#configsliding_partitionsrb)
 - [Tests](#tests)
 - [Versioning](#versioning)
 - [Code of Conduct](#code-of-conduct)

data/lib/sliding_partition/definition.rb

@@ -8,10 +8,12 @@ module SlidingPartition
     attr_reader :model
 
     attr_accessor :inherited_table_name, :time_column, :suffix,
-                  :partition_interval, :retention_interval
+                  :partition_interval, :retention_interval,
+                  :lead_time
 
     def initialize(model)
       @model = model
+      set_defaults
       yield self if block_given?
     end
 
@@ -39,5 +41,11 @@ module SlidingPartition
       @inherited_table_name ||= model.table_name
     end
 
+    private
+
+    def set_defaults
+      @lead_time = 0
+    end
+
   end
 end

data/lib/sliding_partition/identity.rb

@@ -12,7 +12,7 @@ module SlidingPartition
     end
 
     def self.version
-      "0.5.0"
+      "0.6.0"
     end
 
     def self.version_label

data/lib/sliding_partition/partition_ddl_changer.rb

@@ -35,24 +35,27 @@ module SlidingPartition
 
     def migrate!
       connection.transaction do
+        @new_table_name = new_table
         say_with_time("Cloning table") { clone_new_table! }
         say_with_time("Creating #{partitions.tables.size} partition tables") { create_tables! }
-        say_with_time("Migrating data") { migrate_data!(from: parent_table, to: new_table) }
+        say_with_time("Updating trigger function") { update_trigger_function! }
+        say_with_time("Creating trigger") { create_trigger! }
+        say_with_time("Migrating data") { migrate_data!(from: inherited_table_name, to: new_table) }
         say_with_time("Swapping retired & new tables") { swap_tables! }
       end
     end
 
     def final_copy!
       connection.execute(<<-SQL)
-        INSERT INTO #{parent_table} (
-          SELECT * FROM #{retired_table} WHERE id NOT IN (SELECT id FROM #{parent_table})
+        INSERT INTO #{inherited_table_name} (
+          SELECT * FROM #{retired_table} WHERE id NOT IN (SELECT id FROM #{inherited_table_name})
         )
       SQL
     end
 
     def create_tables!
       partitions.each do |partition|
-        create_partition_table(partition) unless partition_table_exists?(partition)
+        create_partition_table(partition)
       end
     end
 
@@ -65,18 +68,18 @@ module SlidingPartition
     def clone_new_table!
       connection.execute <<-SQL
         CREATE TABLE #{new_table} (
-          LIKE #{parent_table} INCLUDING ALL
+          LIKE #{inherited_table_name} INCLUDING ALL
         );
       SQL
     end
 
     def swap_tables!
       connection.execute <<-SQL
-        ALTER TABLE #{parent_table} RENAME TO #{retired_table};
-        ALTER TABLE #{new_table} RENAME TO #{parent_table};
+        ALTER TABLE #{inherited_table_name} RENAME TO #{retired_table};
+        ALTER TABLE #{new_table} RENAME TO #{inherited_table_name};
       SQL
-      update_trigger_function!
-      create_trigger!
+      # update_trigger_function!
+      # create_trigger!
     end
 
     def migrate_data!(from:, to:)
@@ -105,9 +108,9 @@ module SlidingPartition
 
     def create_trigger!
       connection.execute(<<-SQL)
-      DROP TRIGGER IF EXISTS #{inherited_table_name}_trigger ON #{inherited_table_name};
+      DROP TRIGGER IF EXISTS #{inherited_table_name}_trigger ON #{parent_table};
       CREATE TRIGGER #{inherited_table_name}_trigger
-          BEFORE INSERT ON #{inherited_table_name}
+          BEFORE INSERT ON #{parent_table}
           FOR EACH ROW EXECUTE PROCEDURE #{inherited_table_name}_insert_trigger();
       SQL
 
@@ -130,7 +133,7 @@ module SlidingPartition
           ELSIF (NEW.#{time_column} < TIMESTAMP '#{partitions.first_partition_timestamp.to_s(:db)}')
             THEN RETURN NULL; -- Just discard pre-historic rows
           ELSE
-              RAISE EXCEPTION 'Date out of range.  Fix the measurement_insert_trigger() function!';
+              RAISE EXCEPTION 'Date out of range.  Fix the #{inherited_table_name}_insert_trigger() function!';
           END IF;
           RETURN NULL;
       END;
@@ -143,7 +146,7 @@ module SlidingPartition
       <<-SQL
       CREATE TABLE #{partition.table_name} (
         LIKE #{inherited_table_name} INCLUDING ALL
-      ) INHERITS (#{inherited_table_name});
+      ) INHERITS (#{parent_table});
 
       ALTER TABLE #{partition.table_name}
       ADD CHECK (
@@ -176,11 +179,11 @@ module SlidingPartition
     end
 
     def new_table
-      parent_table + "_new"
+      inherited_table_name + "_new"
     end
 
     def retired_table
-      parent_table + "_retired"
+      inherited_table_name + "_retired"
     end
 
   end

data/lib/sliding_partition/table_collection.rb

@@ -9,7 +9,7 @@ module SlidingPartition
     attr_reader :definition, :time
 
     delegate %i[ inherited_table_name time_column suffix
-                 partition_interval retention_interval ] => :definition
+                 partition_interval retention_interval lead_time ] => :definition
 
     def initialize(definition:, at_time:)
       @definition, @time = definition, at_time
@@ -36,7 +36,7 @@ module SlidingPartition
     end
 
     def last_timestamp
-      time + partition_interval
+      time + lead_time + partition_interval
     end
 
     def first_partition_timestamp

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sliding_partition
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Paul Sadauskas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-18 00:00:00.000000000 Z
+date: 2017-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.7'
+        version: '9.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.7'
+        version: '9.4'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement