masamune 0.17.9 → 0.17.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4d0b9b01db4986e5e1e5e0ef9c46164706fa099
-  data.tar.gz: cd49512890e210babbed05ae54ced2af962e0a26
+  metadata.gz: f638075056a6d6b8ef776e42e1cd54b0dd8751ca
+  data.tar.gz: f9bac35901816b810e83da6e7ecbdcbc70e4a110
 SHA512:
-  metadata.gz: 3c67bdd84b95cbfdf0f23e5a9ef182382a4e35942f4232f0c240d52901e21e58646ecba734e1ddddabfac2fadf74150a243a0b00ef371b7b47681cb6c48518e8
-  data.tar.gz: 43a0b9949432131a079c3195b580cd1ed0afad6d7588cf592024b0b4e44cd89980bd2bbf02c72fefbbb15f915c95849b42a7f79d787d376704ef1bcd440c2c18
+  metadata.gz: 293482ddeba0fe77d3e78f04ec9e50f4b26ca3245fec87c32338b0a74946b3e06e8949fd47c256bad14c0af8f4a2faca89d703581c71fbecb6447f1c6fa8d9ec
+  data.tar.gz: d48aa19c8c17612c4eb044d802bacfd1dd60511be11e5fce33cb6fefd76ea4ae98e05f3c727da8fb87bc4ae287b6a93f64d92a3325f2e1e1375b8100567810a2

data/lib/masamune/transform/postgres/snapshot_dimension.psql.erb

@@ -28,11 +28,11 @@ http://www.postgresql.org/message-id/CAGnEbohhKmW55oB0FpQd3naXBkwi74E=8DRZBGFjS-
 WITH ranges AS (
   SELECT *,
   CASE WHEN delta = 0
-  THEN 1 ELSE NULL END r
+  THEN 1 ELSE 0 END r
   FROM <%= source.name %>
 ), windows AS (
   SELECT *,
-  SUM(r) OVER (ORDER BY <%= target.window("start_at #{order}", 'delta', 'source_uuid DESC').join(', ') %>) window_id
+  SUM(r) OVER (PARTITION BY <%= target.window.join(', ') %> ORDER BY <%= ["start_at #{order}", 'delta', "source_uuid #{order}"].join(', ') %>) AS window_id
   FROM ranges
 ), snapshot AS (
   SELECT
@@ -41,15 +41,15 @@ WITH ranges AS (
     <%- end -%>
     consolidated.start_at
   FROM (
-    SELECT DISTINCT ON (<%= target.window('start_at', 'id').join(', ') %>)
+    SELECT DISTINCT ON (<%= target.window('start_at').join(', ') %>)
       <%- target.insert_values(window: 'w').each do |value, last| -%>
       <%= value %><%= ',' %>
       <%- end -%>
       start_at AS start_at
     FROM
       windows
-    WINDOW w AS (PARTITION BY <%= target.window('window_id').join(', ') %> ORDER BY start_at <%= order %>)
-    ORDER BY <%= target.window("start_at #{order}", "id DESC", 'window_id').join(', ') %>
+    WINDOW w AS (PARTITION BY <%= target.window('window_id').join(', ') %> ORDER BY <%= ["start_at #{order}", "source_uuid #{order}"].join(', ') %>)
+    ORDER BY <%= target.window("start_at #{order}", "source_uuid DESC", 'window_id').join(', ') %>
   ) consolidated
   WHERE
     <%- target.insert_view_constraints.each do |constraint, last| -%>

data/lib/masamune/version.rb

@@ -21,5 +21,5 @@
 #  THE SOFTWARE.
 
 module Masamune
-  VERSION = '0.17.9'
+  VERSION = '0.17.10'
 end

data/spec/masamune/transform/snapshot_dimension_spec.rb

@@ -47,11 +47,11 @@ describe Masamune::Transform::SnapshotDimension do
         WITH ranges AS (
           SELECT *,
           CASE WHEN delta = 0
-          THEN 1 ELSE NULL END r
+          THEN 1 ELSE 0 END r
           FROM user_dimension_ledger
         ), windows AS (
           SELECT *,
-          SUM(r) OVER (ORDER BY tenant_id, user_id, start_at ASC, delta, source_uuid DESC) window_id
+          SUM(r) OVER (PARTITION BY tenant_id, user_id ORDER BY start_at ASC, delta, source_uuid ASC) AS window_id
           FROM ranges
         ), snapshot AS (
           SELECT
@@ -61,7 +61,7 @@ describe Masamune::Transform::SnapshotDimension do
             consolidated.preferences,
             consolidated.start_at
           FROM (
-            SELECT DISTINCT ON (tenant_id, user_id, start_at, id)
+            SELECT DISTINCT ON (tenant_id, user_id, start_at)
               coalesce_merge(user_account_state_type_id) OVER w AS user_account_state_type_id,
               tenant_id AS tenant_id,
               user_id AS user_id,
@@ -69,8 +69,8 @@ describe Masamune::Transform::SnapshotDimension do
               start_at AS start_at
             FROM
               windows
-            WINDOW w AS (PARTITION BY tenant_id, user_id, window_id ORDER BY start_at ASC)
-            ORDER BY tenant_id, user_id, start_at ASC, id DESC, window_id
+            WINDOW w AS (PARTITION BY tenant_id, user_id, window_id ORDER BY start_at ASC, source_uuid ASC)
+            ORDER BY tenant_id, user_id, start_at ASC, source_uuid DESC, window_id
           ) consolidated
           WHERE
             consolidated.user_account_state_type_id IS NOT NULL AND
@@ -100,11 +100,11 @@ describe Masamune::Transform::SnapshotDimension do
         WITH ranges AS (
           SELECT *,
           CASE WHEN delta = 0
-          THEN 1 ELSE NULL END r
+          THEN 1 ELSE 0 END r
           FROM user_dimension_ledger
         ), windows AS (
           SELECT *,
-          SUM(r) OVER (ORDER BY tenant_id, user_id, start_at DESC, delta, source_uuid DESC) window_id
+          SUM(r) OVER (PARTITION BY tenant_id, user_id ORDER BY start_at DESC, delta, source_uuid DESC) AS window_id
           FROM ranges
         ), snapshot AS (
           SELECT
@@ -114,7 +114,7 @@ describe Masamune::Transform::SnapshotDimension do
             consolidated.preferences,
             consolidated.start_at
           FROM (
-            SELECT DISTINCT ON (tenant_id, user_id, start_at, id)
+            SELECT DISTINCT ON (tenant_id, user_id, start_at)
               coalesce_merge(user_account_state_type_id) OVER w AS user_account_state_type_id,
               tenant_id AS tenant_id,
               user_id AS user_id,
@@ -122,8 +122,8 @@ describe Masamune::Transform::SnapshotDimension do
               start_at AS start_at
             FROM
               windows
-            WINDOW w AS (PARTITION BY tenant_id, user_id, window_id ORDER BY start_at DESC)
-            ORDER BY tenant_id, user_id, start_at DESC, id DESC, window_id
+            WINDOW w AS (PARTITION BY tenant_id, user_id, window_id ORDER BY start_at DESC, source_uuid DESC)
+            ORDER BY tenant_id, user_id, start_at DESC, source_uuid DESC, window_id
           ) consolidated
           WHERE
             consolidated.user_account_state_type_id IS NOT NULL AND

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: masamune
 version: !ruby/object:Gem::Version
-  version: 0.17.9
+  version: 0.17.10
 platform: ruby
 authors:
 - Michael Andrews
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-25 00:00:00.000000000 Z
+date: 2016-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor