masamune 0.12.1 → 0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fa78c46b273926ab7d772334d589a4376532612
-  data.tar.gz: c95f3122a4c62bd3fa65f1f0bf4b16287917553e
+  metadata.gz: 49cf069b1b8b08d4564094cbf3893fd9a5a96d6d
+  data.tar.gz: eae59d5b26dcc4b78db6e4024841b53bc48cac6b
 SHA512:
-  metadata.gz: 2c61a1654730091053886326dce2a53b313df2041040e5dba0c54c5699c39927eae80299bf4b50333ad1a700a8322144310c6fdb65d6022ab51a26b7cfee0e4a
-  data.tar.gz: baba5a9769d75196fcf35442084326e0d0c27ab22b71aaf2c4e31826c03953ea23c4b8e9e9af6b4234d0ef8910c22bb8783275405d09d173e6f617867ee3c193
+  metadata.gz: 05f7ebbb93c6eeae7b5ede63c098da7d08fb1a5cc616cc0cf31ebfd7eaca7447b70e29d5f9b5e7c54b5217e8689d8270660e349a4e35fb4d4f26467da01aeac0
+  data.tar.gz: cd36f48081410e820ed5485820b186b6455ecf456eeec364830f53cd9eb0ff53b1500ac85fbc2dc03d964bd97bfd2f577a064939777a121f573b939b910c2b04

data/lib/masamune/schema/column.rb

@@ -80,8 +80,6 @@ module Masamune::Schema
         'uuid_generate_v4()'
       when :sequence
         "nextval('#{sequence_id}')"
-      when :enum
-        values.first
       end
     end
 
@@ -277,7 +275,7 @@ module Masamune::Schema
           nil
         end
       when :integer
-        value.nil? ? nil : value.to_i
+        value.blank? ? nil : value.to_i
       when :yaml
         case value
         when Hash
@@ -470,6 +468,7 @@ module Masamune::Schema
     def required_value?
       return false if reference && (reference.null || !reference.default.nil?)
       return false if null || !default.nil?
+      return false if !strict
       true
     end
 

data/lib/masamune/transform/deduplicate_dimension.psql.erb

@@ -20,6 +20,17 @@
 --  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 --  THE SOFTWARE.
 
+WITH consolidated AS (
+  SELECT
+    <%- target.insert_view_values(coalesce: true).each do |value| -%>
+    <%= value %><%= ',' %>
+    <%- end -%>
+    parent_id,
+    record_id,
+    start_at
+  FROM
+    <%= source.name %>
+)
 INSERT INTO
   <%= target.name %> (<%= target.insert_columns.join(', ') %>, parent_id, record_id, start_at)
 SELECT DISTINCT
@@ -38,13 +49,13 @@ FROM (
     record_id,
     start_at,
     CASE
-    WHEN <%= target.insert_view_values.map { |value| "(LAG(#{value}) OVER w = #{value})" }.join(' AND ') %> THEN
+    WHEN <%= target.duplicate_value_conditions('w').join(' AND ') %> THEN
       1
     ELSE
       0
     END AS duplicate
   FROM
-    <%= source.name %>
+    consolidated
   WINDOW w AS (PARTITION BY <%= target.window.join(', ') %> ORDER BY start_at)
 ) tmp
 WHERE

data/lib/masamune/transform/deduplicate_dimension.rb

@@ -35,8 +35,26 @@ module Masamune::Transform
         consolidated_columns.map { |_, column| column.name }
       end
 
-      def insert_view_values
-        consolidated_columns.map { |_, column| column.name }
+      def insert_view_values(coalesce: false)
+        consolidated_columns.map do |_, column|
+          if !column.default.nil? && coalesce
+            "COALESCE(#{column.name}, #{column.sql_value(column.default)}) AS #{column.name}"
+          else
+            column.name
+          end
+        end
+      end
+
+      def duplicate_value_conditions(window)
+        [].tap do |result|
+          consolidated_columns.map do |_, column|
+            if column.null
+              result << "((LAG(#{column.name}) OVER #{window} = #{column.name}) OR (LAG(#{column.name}) OVER #{window} IS NULL AND #{column.name} IS NULL))"
+            else
+              result << "(LAG(#{column.name}) OVER #{window} = #{column.name})"
+            end
+          end
+        end
       end
 
       def window(*extra)

data/lib/masamune/transform/denormalize_table.psql.erb

@@ -27,7 +27,7 @@ SELECT
 FROM
   <%= target.name %>
 <%- target.join_conditions(columns).each do |table, condition| -%>
-JOIN
+LEFT JOIN
   <%= table %>
 ON
   <%= condition %>

data/lib/masamune/transform/replace_table.psql.erb

@@ -0,0 +1,67 @@
+--  The MIT License (MIT)
+--
+--  Copyright (c) 2014-2015, VMware, Inc. All Rights Reserved.
+--
+--  Permission is hereby granted, free of charge, to any person obtaining a copy
+--  of this software and associated documentation files (the "Software"), to deal
+--  in the Software without restriction, including without limitation the rights
+--  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+--  copies of the Software, and to permit persons to whom the Software is
+--  furnished to do so, subject to the following conditions:
+--
+--  The above copyright notice and this permission notice shall be included in
+--  all copies or substantial portions of the Software.
+--
+--  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+--  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+--  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+--  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+--  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+--  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+--  THE SOFTWARE.
+
+<%- target_tmp = target.stage_table(suffix: 'tmp')  %>
+
+SELECT pg_advisory_lock(ddl_advisory_lock());
+
+DROP TABLE IF EXISTS <%= target_tmp.name %> CASCADE;
+
+BEGIN;
+SET TRANSACTION ISOLATION LEVEL SERIALIZABLE;
+
+ALTER TABLE <%= target.name %> DROP CONSTRAINT IF EXISTS <%= target.name %>_time_key_check;
+<%- target.foreign_key_columns.each do |column| -%>
+<%- if column.reference_constraint -%>
+ALTER TABLE <%= target.name %> DROP CONSTRAINT IF EXISTS <%= target.name %>_<%= column.name %>_fkey CASCADE;
+<%- end -%>
+<%- end -%>
+
+<%- target.index_columns.each do |column_names, unique, id| -%>
+<%- index_name = "#{target.name}_#{id}_index" -%>
+DROP INDEX IF EXISTS <%= index_name %>;
+<%- end -%>
+
+ALTER TABLE <%= target.name %> RENAME TO <%= target_tmp.name %>;
+ALTER TABLE <%= source.name %> RENAME TO <%= target.name %>;
+
+ALTER TABLE <%= target.name %> INHERIT <%= target.parent.name %>;
+ALTER TABLE <%= target.name %> ADD CONSTRAINT <%= target.name %>_time_key_check <%= target.constraints %>;
+<%- target.foreign_key_columns.each do |column| -%>
+<%- if column.reference_constraint -%>
+ALTER TABLE <%= target.name %> ADD CONSTRAINT <%= target.name %>_<%= column.name %>_fkey FOREIGN KEY (<%= column.name %>) <%= column.reference_constraint %> NOT VALID DEFERRABLE INITIALLY DEFERRED;
+<%- end -%>
+<%- end -%>
+
+<%- target.index_columns.each do |column_names, unique, id| -%>
+<%- index_name = "#{target.name}_#{id}_index" -%>
+CREATE <%= unique ? 'UNIQUE INDEX' : 'INDEX' %> <%= index_name %> ON <%= target.name %> (<%= column_names.join(', ') %>);
+<%- end -%>
+
+ANALYZE <%= target.name %>;
+
+COMMIT;
+
+DROP TABLE IF EXISTS <%= target_tmp.name %> CASCADE;
+DROP TABLE IF EXISTS <%= source.name %> CASCADE;
+
+SELECT pg_advisory_unlock(ddl_advisory_lock());

data/lib/masamune/transform/rollup_fact.psql.erb

@@ -25,11 +25,12 @@
 SELECT pg_advisory_lock(<%= target_stage.lock_id %>);
 
 DROP TABLE IF EXISTS <%= target_stage.name %> CASCADE;
-DROP TABLE IF EXISTS <%= target_stage.name %>_tmp CASCADE;
 
 CREATE TABLE IF NOT EXISTS <%= target.name %> (LIKE <%= target.parent.name %> INCLUDING ALL);
 CREATE TABLE IF NOT EXISTS <%= target_stage.name %> (LIKE <%= target.parent.name %> INCLUDING ALL);
 
+BEGIN;
+
 INSERT INTO
   <%= target_stage.name %> (<%= target.insert_columns(source).join(', ') %>)
 SELECT
@@ -50,46 +51,8 @@ GROUP BY
   <%- end -%>
 ;
 
-SELECT pg_advisory_lock(ddl_advisory_lock());
-
-BEGIN;
-SET TRANSACTION ISOLATION LEVEL SERIALIZABLE;
-
-ALTER TABLE <%= target.name %> DROP CONSTRAINT IF EXISTS <%= target.name %>_time_key_check;
-<%- target.foreign_key_columns.each do |column| -%>
-<%- if column.reference_constraint -%>
-ALTER TABLE <%= target.name %> DROP CONSTRAINT IF EXISTS <%= target.name %>_<%= column.name %>_fkey CASCADE;
-<%- end -%>
-<%- end -%>
-
-<%- target.index_columns.each do |column_names, unique, id| -%>
-<%- index_name = "#{target.name}_#{id}_index" -%>
-DROP INDEX IF EXISTS <%= index_name %>;
-<%- end -%>
-
-ALTER TABLE <%= target.name %> RENAME TO <%= target_stage.name %>_tmp;
-ALTER TABLE <%= target_stage.name %> RENAME TO <%= target.name %>;
-
-ALTER TABLE <%= target.name %> INHERIT <%= target.parent.name %>;
-ALTER TABLE <%= target.name %> ADD CONSTRAINT <%= target.name %>_time_key_check <%= target.constraints %>;
-<%- target.foreign_key_columns.each do |column| -%>
-<%- if column.reference_constraint -%>
-ALTER TABLE <%= target.name %> ADD CONSTRAINT <%= target.name %>_<%= column.name %>_fkey FOREIGN KEY (<%= column.name %>) <%= column.reference_constraint %> NOT VALID DEFERRABLE INITIALLY DEFERRED;
-<%- end -%>
-<%- end -%>
-
-<%- target.index_columns.each do |column_names, unique, id| -%>
-<%- index_name = "#{target.name}_#{id}_index" -%>
-CREATE <%= unique ? 'UNIQUE INDEX' : 'INDEX' %> <%= index_name %> ON <%= target.name %> (<%= column_names.join(', ') %>);
-<%- end -%>
-
-ANALYZE <%= target.name %>;
-
 COMMIT;
 
-DROP TABLE IF EXISTS <%= target_stage.name %>_tmp CASCADE;
-DROP TABLE IF EXISTS <%= target_stage.name %> CASCADE;
-
-SELECT pg_advisory_unlock(ddl_advisory_lock());
+<%= render 'replace_table.psql.erb', source: target_stage, target: target %>
 
 SELECT pg_advisory_unlock(<%= target_stage.lock_id %>);

data/lib/masamune/transform/snapshot_dimension.rb

@@ -42,7 +42,7 @@ module Masamune::Transform
       end
 
       def insert_view_constraints
-        consolidated_columns.reject { |_, column| column.null }.map { |_, column| "#{column.name} IS NOT NULL" }
+        consolidated_columns.reject { |_, column| !column.default.nil? || column.null }.map { |_, column| "#{column.name} IS NOT NULL" }
       end
       method_with_last_element :insert_view_constraints
 

data/lib/masamune/transform/stage_fact.psql.erb

@@ -26,11 +26,12 @@
 SELECT pg_advisory_lock(<%= target_partition.lock_id %>);
 
 DROP TABLE IF EXISTS <%= target_stage.name %> CASCADE;
-DROP TABLE IF EXISTS <%= target_partition.name %>_tmp CASCADE;
 
 CREATE TABLE IF NOT EXISTS <%= target_stage.name %> (LIKE <%= target.name %> INCLUDING ALL);
 CREATE TABLE IF NOT EXISTS <%= target_partition.name %> (LIKE <%= target.name %> INCLUDING ALL);
 
+BEGIN;
+
 INSERT INTO
   <%= target_stage.name %> (<%= target.insert_columns(source).join(', ') %>)
 SELECT
@@ -47,46 +48,8 @@ ON
 <%- end -%>
 ;
 
-SELECT pg_advisory_lock(ddl_advisory_lock());
-
-BEGIN;
-SET TRANSACTION ISOLATION LEVEL SERIALIZABLE;
-
-ALTER TABLE <%= target_partition.name %> DROP CONSTRAINT IF EXISTS <%= target_partition.name %>_time_key_check;
-<%- target.foreign_key_columns.each do |column| -%>
-<%- if column.reference_constraint -%>
-ALTER TABLE <%= target_partition.name %> DROP CONSTRAINT IF EXISTS <%= target_partition.name %>_<%= column.name %>_fkey CASCADE;
-<%- end -%>
-<%- end -%>
-
-<%- target_partition.index_columns.each do |column_names, unique, id| -%>
-<%- index_name = "#{target_partition.name}_#{id}_index" -%>
-DROP INDEX IF EXISTS <%= index_name %>;
-<%- end -%>
-
-ALTER TABLE <%= target_partition.name %> RENAME TO <%= target_partition.name %>_tmp;
-ALTER TABLE <%= target_stage.name %> RENAME TO <%= target_partition.name %>;
-
-ALTER TABLE <%= target_partition.name %> INHERIT <%= target.name %>;
-ALTER TABLE <%= target_partition.name %> ADD CONSTRAINT <%= target_partition.name %>_time_key_check <%= target_partition.constraints %>;
-<%- target.foreign_key_columns.each do |column| -%>
-<%- if column.reference_constraint -%>
-ALTER TABLE <%= target_partition.name %> ADD CONSTRAINT <%= target_partition.name %>_<%= column.name %>_fkey FOREIGN KEY (<%= column.name %>) <%= column.reference_constraint %> NOT VALID DEFERRABLE INITIALLY DEFERRED;
-<%- end -%>
-<%- end -%>
-
-<%- target_partition.index_columns.each do |column_names, unique, id| -%>
-<%- index_name = "#{target_partition.name}_#{id}_index" -%>
-CREATE <%= unique ? 'UNIQUE INDEX' : 'INDEX' %> <%= index_name %> ON <%= target_partition.name %> (<%= column_names.join(', ') %>);
-<%- end -%>
-
-ANALYZE <%= target_partition.name %>;
-
 COMMIT;
 
-DROP TABLE IF EXISTS <%= target_partition.name %>_tmp CASCADE;
-DROP TABLE IF EXISTS <%= target_stage.name %> CASCADE;
-
-SELECT pg_advisory_unlock(ddl_advisory_lock());
+<%= render 'replace_table.psql.erb', source: target_stage, target: target_partition %>
 
 SELECT pg_advisory_unlock(<%= target_partition.lock_id %>);

data/lib/masamune/version.rb

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

data/spec/masamune/schema/column_spec.rb

@@ -65,7 +65,7 @@ describe Masamune::Schema::Column do
 
       context '#default' do
         subject { column.default }
-        it { is_expected.to eq('public') }
+        it { is_expected.to be_nil }
       end
 
       context '#sql_type' do
@@ -342,6 +342,30 @@ describe Masamune::Schema::Column do
       end
     end
 
+    context 'with type :integer' do
+      let(:column) { described_class.new(id: 'integer', type: :integer) }
+
+      context 'when nil' do
+        let(:value) { nil }
+        it { is_expected.to be(nil) }
+      end
+
+      context 'when blank' do
+        let(:value) { '' }
+        it { is_expected.to be(nil) }
+      end
+
+      context 'when String encoded Integer' do
+        let(:value) { "1" }
+        it { is_expected.to eq(1) }
+      end
+
+      context 'when Integer' do
+        let(:value) { 1 }
+        it { is_expected.to eq(1) }
+      end
+    end
+
     context 'with type :timestamp' do
       let(:column) { described_class.new(id: 'timestamp', type: :timestamp) }
 
@@ -635,6 +659,16 @@ describe Masamune::Schema::Column do
       it { is_expected.to eq(false) }
     end
 
+    context 'when :strict true' do
+      let(:column) { described_class.new id: 'name', type: :string, strict: true }
+      it { is_expected.to eq(true) }
+    end
+
+    context 'when :strict false' do
+      let(:column) { described_class.new id: 'name', type: :string, strict: false }
+      it { is_expected.to eq(false) }
+    end
+
     context 'when column has default' do
       let(:column) { described_class.new id: 'name', type: :string, default: 'missing' }
       it { is_expected.to eq(false) }

data/spec/masamune/transform/deduplicate_dimension_spec.rb

@@ -46,6 +46,18 @@ describe Masamune::Transform::DeduplicateDimension do
 
     it 'should render deduplicate_dimension template' do
       is_expected.to eq <<-EOS.strip_heredoc
+        WITH consolidated AS (
+          SELECT
+            user_account_state_type_id,
+            tenant_id,
+            user_id,
+            preferences,
+            parent_id,
+            record_id,
+            start_at
+          FROM
+            user_consolidated_dimension_stage
+        )
         INSERT INTO
           user_deduplicated_dimension_stage (user_account_state_type_id, tenant_id, user_id, preferences, parent_id, record_id, start_at)
         SELECT DISTINCT
@@ -66,13 +78,13 @@ describe Masamune::Transform::DeduplicateDimension do
             record_id,
             start_at,
             CASE
-            WHEN (LAG(user_account_state_type_id) OVER w = user_account_state_type_id) AND (LAG(tenant_id) OVER w = tenant_id) AND (LAG(user_id) OVER w = user_id) AND (LAG(preferences) OVER w = preferences) THEN
+            WHEN (LAG(user_account_state_type_id) OVER w = user_account_state_type_id) AND (LAG(tenant_id) OVER w = tenant_id) AND (LAG(user_id) OVER w = user_id) AND ((LAG(preferences) OVER w = preferences) OR (LAG(preferences) OVER w IS NULL AND preferences IS NULL)) THEN
               1
             ELSE
               0
             END AS duplicate
           FROM
-            user_consolidated_dimension_stage
+            consolidated
           WINDOW w AS (PARTITION BY tenant_id, user_id ORDER BY start_at)
         ) tmp
         WHERE

data/spec/masamune/transform/denormalize_table_spec.rb

@@ -97,19 +97,19 @@ describe Masamune::Transform::DenormalizeTable do
         visits_fact.time_key
       FROM
         visits_fact
-      JOIN
+      LEFT JOIN
         date_dimension
       ON
         date_dimension.id = visits_fact.date_dimension_id
-      JOIN
+      LEFT JOIN
         tenant_dimension
       ON
         tenant_dimension.id = visits_fact.tenant_dimension_id
-      JOIN
+      LEFT JOIN
         user_dimension
       ON
         user_dimension.id = visits_fact.user_dimension_id
-      JOIN
+      LEFT JOIN
         user_agent_type
       ON
         user_agent_type.id = visits_fact.user_agent_type_id
@@ -152,19 +152,19 @@ describe Masamune::Transform::DenormalizeTable do
         visits_fact.time_key
       FROM
         visits_fact
-      JOIN
+      LEFT JOIN
         date_dimension
       ON
         date_dimension.id = visits_fact.date_dimension_id
-      JOIN
+      LEFT JOIN
         tenant_dimension
       ON
         tenant_dimension.id = visits_fact.tenant_dimension_id
-      JOIN
+      LEFT JOIN
         user_dimension
       ON
         user_dimension.id = visits_fact.user_dimension_id
-      JOIN
+      LEFT JOIN
         user_agent_type
       ON
         user_agent_type.id = visits_fact.user_agent_type_id

data/spec/masamune/transform/rollup_fact_spec.rb

@@ -95,11 +95,12 @@ describe Masamune::Transform::RollupFact do
         SELECT pg_advisory_lock(42);
 
         DROP TABLE IF EXISTS visits_hourly_fact_y2014m08_stage CASCADE;
-        DROP TABLE IF EXISTS visits_hourly_fact_y2014m08_stage_tmp CASCADE;
 
         CREATE TABLE IF NOT EXISTS visits_hourly_fact_y2014m08 (LIKE visits_hourly_fact INCLUDING ALL);
         CREATE TABLE IF NOT EXISTS visits_hourly_fact_y2014m08_stage (LIKE visits_hourly_fact INCLUDING ALL);
 
+        BEGIN;
+
         INSERT INTO
           visits_hourly_fact_y2014m08_stage (date_dimension_id, tenant_dimension_id, user_dimension_id, user_agent_type_id, feature_type_id, total, time_key)
         SELECT
@@ -125,8 +126,12 @@ describe Masamune::Transform::RollupFact do
           (visits_transaction_fact_y2014m08.time_key - (visits_transaction_fact_y2014m08.time_key % 3600))
         ;
 
+        COMMIT;
+
         SELECT pg_advisory_lock(ddl_advisory_lock());
 
+        DROP TABLE IF EXISTS visits_hourly_fact_y2014m08_stage_tmp CASCADE;
+
         BEGIN;
         SET TRANSACTION ISOLATION LEVEL SERIALIZABLE;
 
@@ -192,11 +197,12 @@ describe Masamune::Transform::RollupFact do
         SELECT pg_advisory_lock(42);
 
         DROP TABLE IF EXISTS visits_daily_fact_y2014m08_stage CASCADE;
-        DROP TABLE IF EXISTS visits_daily_fact_y2014m08_stage_tmp CASCADE;
 
         CREATE TABLE IF NOT EXISTS visits_daily_fact_y2014m08 (LIKE visits_daily_fact INCLUDING ALL);
         CREATE TABLE IF NOT EXISTS visits_daily_fact_y2014m08_stage (LIKE visits_daily_fact INCLUDING ALL);
 
+        BEGIN;
+
         INSERT INTO
           visits_daily_fact_y2014m08_stage (date_dimension_id, tenant_dimension_id, user_dimension_id, user_agent_type_id, feature_type_id, total, time_key)
         SELECT
@@ -221,8 +227,12 @@ describe Masamune::Transform::RollupFact do
           visits_hourly_fact_y2014m08.feature_type_id
         ;
 
+        COMMIT;
+
         SELECT pg_advisory_lock(ddl_advisory_lock());
 
+        DROP TABLE IF EXISTS visits_daily_fact_y2014m08_stage_tmp CASCADE;
+
         BEGIN;
         SET TRANSACTION ISOLATION LEVEL SERIALIZABLE;
 
@@ -288,11 +298,12 @@ describe Masamune::Transform::RollupFact do
         SELECT pg_advisory_lock(42);
 
         DROP TABLE IF EXISTS visits_monthly_fact_y2014m08_stage CASCADE;
-        DROP TABLE IF EXISTS visits_monthly_fact_y2014m08_stage_tmp CASCADE;
 
         CREATE TABLE IF NOT EXISTS visits_monthly_fact_y2014m08 (LIKE visits_monthly_fact INCLUDING ALL);
         CREATE TABLE IF NOT EXISTS visits_monthly_fact_y2014m08_stage (LIKE visits_monthly_fact INCLUDING ALL);
 
+        BEGIN;
+
         INSERT INTO
           visits_monthly_fact_y2014m08_stage (date_dimension_id, tenant_dimension_id, user_dimension_id, user_agent_type_id, feature_type_id, total, time_key)
         SELECT
@@ -317,8 +328,12 @@ describe Masamune::Transform::RollupFact do
           visits_daily_fact_y2014m08.feature_type_id
         ;
 
+        COMMIT;
+
         SELECT pg_advisory_lock(ddl_advisory_lock());
 
+        DROP TABLE IF EXISTS visits_monthly_fact_y2014m08_stage_tmp CASCADE;
+
         BEGIN;
         SET TRANSACTION ISOLATION LEVEL SERIALIZABLE;
 

data/spec/masamune/transform/stage_fact_spec.rb

@@ -105,11 +105,12 @@ describe Masamune::Transform::StageFact do
         SELECT pg_advisory_lock(42);
 
         DROP TABLE IF EXISTS visits_hourly_fact_y2014m08_stage CASCADE;
-        DROP TABLE IF EXISTS visits_hourly_fact_y2014m08_tmp CASCADE;
 
         CREATE TABLE IF NOT EXISTS visits_hourly_fact_y2014m08_stage (LIKE visits_hourly_fact INCLUDING ALL);
         CREATE TABLE IF NOT EXISTS visits_hourly_fact_y2014m08 (LIKE visits_hourly_fact INCLUDING ALL);
 
+        BEGIN;
+
         INSERT INTO
           visits_hourly_fact_y2014m08_stage (date_dimension_id, tenant_dimension_id, user_dimension_id, group_dimension_id, user_agent_type_id, feature_type_id, session_type_id, total, time_key)
         SELECT
@@ -156,8 +157,12 @@ describe Masamune::Transform::StageFact do
           feature_type.name = visits_hourly_file_fact_stage.feature_type_name
         ;
 
+        COMMIT;
+
         SELECT pg_advisory_lock(ddl_advisory_lock());
 
+        DROP TABLE IF EXISTS visits_hourly_fact_y2014m08_stage_tmp CASCADE;
+
         BEGIN;
         SET TRANSACTION ISOLATION LEVEL SERIALIZABLE;
 
@@ -180,7 +185,7 @@ describe Masamune::Transform::StageFact do
         DROP INDEX IF EXISTS visits_hourly_fact_y2014m08_422efee_index;
         DROP INDEX IF EXISTS visits_hourly_fact_y2014m08_6444ed3_index;
 
-        ALTER TABLE visits_hourly_fact_y2014m08 RENAME TO visits_hourly_fact_y2014m08_tmp;
+        ALTER TABLE visits_hourly_fact_y2014m08 RENAME TO visits_hourly_fact_y2014m08_stage_tmp;
         ALTER TABLE visits_hourly_fact_y2014m08_stage RENAME TO visits_hourly_fact_y2014m08;
 
         ALTER TABLE visits_hourly_fact_y2014m08 INHERIT visits_hourly_fact;
@@ -207,7 +212,7 @@ describe Masamune::Transform::StageFact do
 
         COMMIT;
 
-        DROP TABLE IF EXISTS visits_hourly_fact_y2014m08_tmp CASCADE;
+        DROP TABLE IF EXISTS visits_hourly_fact_y2014m08_stage_tmp CASCADE;
         DROP TABLE IF EXISTS visits_hourly_fact_y2014m08_stage CASCADE;
 
         SELECT pg_advisory_unlock(ddl_advisory_lock());

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: masamune
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.2
 platform: ruby
 authors:
 - Michael Andrews
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-14 00:00:00.000000000 Z
+date: 2015-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -285,6 +285,7 @@ files:
 - lib/masamune/transform/operator.rb
 - lib/masamune/transform/relabel_dimension.psql.erb
 - lib/masamune/transform/relabel_dimension.rb
+- lib/masamune/transform/replace_table.psql.erb
 - lib/masamune/transform/rollup_fact.psql.erb
 - lib/masamune/transform/rollup_fact.rb
 - lib/masamune/transform/snapshot_dimension.psql.erb