masamune 0.13.0 → 0.13.1

data/spec/masamune/transform/define_schema_spec.rb

@@ -38,6 +38,12 @@ describe Masamune::Transform::DefineSchema do
           column 'preferences', type: :key_value, null: true
         end
 
+        fact 'visits', partition: 'y%Ym%m' do
+          partition :y
+          partition :m
+          measure 'total', type: :integer
+        end
+
         file 'user' do
           column 'tenant_id', type: :integer
           column 'user_id', type: :integer
@@ -50,13 +56,31 @@ describe Masamune::Transform::DefineSchema do
       end
     end
 
-    subject(:result) { transform.define_schema(catalog, :postgres).to_s }
+    context 'without options' do
+      subject(:result) { transform.define_schema(catalog, :postgres).to_s }
 
-    it 'should render combined template' do
-      is_expected.to eq Masamune::Template.combine \
-        Masamune::Transform::Operator.new('define_schema', source: catalog.postgres),
-        transform.define_table(catalog.postgres.dimensions['user_account_state']),
-        transform.define_table(catalog.postgres.dimensions['user'])
+      it 'should render combined template' do
+        is_expected.to eq Masamune::Template.combine \
+          Masamune::Transform::Operator.new('define_schema', source: catalog.postgres),
+          transform.define_table(catalog.postgres.dimensions['user_account_state']),
+          transform.define_table(catalog.postgres.dimensions['user']),
+          transform.define_table(catalog.postgres.facts['visits'])
+      end
+    end
+
+    context 'without start_date and stop_date' do
+      subject(:result) { transform.define_schema(catalog, :postgres, start_date: Date.civil(2015, 01, 01), stop_date: Date.civil(2015, 03, 15)).to_s }
+
+      it 'should render combined template' do
+        is_expected.to eq Masamune::Template.combine \
+          Masamune::Transform::Operator.new('define_schema', source: catalog.postgres),
+          transform.define_table(catalog.postgres.dimensions['user_account_state']),
+          transform.define_table(catalog.postgres.dimensions['user']),
+          transform.define_table(catalog.postgres.facts['visits']),
+          transform.define_table(catalog.postgres.facts['visits'].partition_table(Date.civil(2015, 01, 01))),
+          transform.define_table(catalog.postgres.facts['visits'].partition_table(Date.civil(2015, 02, 01))),
+          transform.define_table(catalog.postgres.facts['visits'].partition_table(Date.civil(2015, 03, 01)))
+      end
     end
   end
 

data/spec/masamune/transform/define_table.fact_spec.rb

@@ -148,6 +148,17 @@ describe Masamune::Transform::DefineTable do
     end
   end
 
+  context 'for postgres fact partition with :post' do
+    let(:target) { catalog.postgres.visits_fact.partition_table(Date.civil(2015, 01, 01)) }
+
+    subject(:result) { transform.define_table(target, [], :post).to_s }
+
+    it 'should eq render table template' do
+      is_expected.to match /ALTER TABLE visits_fact_y2015m01 INHERIT visits_fact;/
+      is_expected.to match /ALTER TABLE visits_fact_y2015m01 ADD CONSTRAINT visits_fact_y2015m01_time_key_check CHECK \(time_key >= 1420070400 AND time_key < 1422748800\);/
+    end
+  end
+
   describe 'for fact table from file with sources files' do
     let(:files) { (1..3).map { |i| double(path: "output_#{i}.csv") } }
     let(:target) { catalog.postgres.visits_fact }

data/spec/masamune/transform/define_table.table_spec.rb

@@ -24,9 +24,9 @@ require 'spec_helper'
 
 describe Masamune::Transform::DefineTable do
   let(:files) { [] }
-  let(:options) { {} }
+  let(:section) { :all }
 
-  subject { transform.define_table(target, files, options).to_s }
+  subject { transform.define_table(target, files, section).to_s }
 
   context 'for postgres table with columns' do
     before do
@@ -794,7 +794,7 @@ describe Masamune::Transform::DefineTable do
     end
   end
 
-  context 'for postgres table with index columns and with_index: false' do
+  context 'for postgres table with index columns and section :pre' do
     before do
       catalog.schema :postgres do
         table 'user' do
@@ -804,7 +804,7 @@ describe Masamune::Transform::DefineTable do
       end
     end
 
-    let(:options) { { with_index: false } }
+    let(:section) { :pre }
     let(:target) { catalog.postgres.user_table }
 
     it 'should render table template' do
@@ -815,16 +815,11 @@ describe Masamune::Transform::DefineTable do
           tenant_id INTEGER NOT NULL,
           user_id INTEGER NOT NULL
         );
-
-        DO $$ BEGIN
-        IF NOT EXISTS (SELECT 1 FROM pg_class c WHERE c.relname = 'user_table_pkey') THEN
-        ALTER TABLE user_table ADD PRIMARY KEY (id);
-        END IF; END $$;
       EOS
     end
   end
 
-  context 'for postgres table with referenced tables and with_foreign_key: false' do
+  context 'for postgres table with referenced tables and section :pre' do
     before do
       catalog.schema :postgres do
         table 'user_account_state' do
@@ -842,7 +837,7 @@ describe Masamune::Transform::DefineTable do
       end
     end
 
-    let(:options) { { with_foreign_key: false } }
+    let(:section) { :pre }
     let(:target) { catalog.postgres.user_table }
 
     it 'should render table template' do
@@ -853,16 +848,11 @@ describe Masamune::Transform::DefineTable do
           user_account_state_table_id INTEGER NOT NULL DEFAULT default_user_account_state_table_id(),
           name VARCHAR NOT NULL
         );
-
-        DO $$ BEGIN
-        IF NOT EXISTS (SELECT 1 FROM pg_class c WHERE c.relname = 'user_table_pkey') THEN
-        ALTER TABLE user_table ADD PRIMARY KEY (id);
-        END IF; END $$;
       EOS
     end
   end
 
-  context 'for postgres table with unique columns and with_unique_constraint: false' do
+  context 'for postgres table with unique columns and section :pre' do
     before do
       catalog.schema :postgres do
         table 'user' do
@@ -872,7 +862,7 @@ describe Masamune::Transform::DefineTable do
       end
     end
 
-    let(:options) { { with_unique_constraint: false } }
+    let(:section) { :pre }
     let(:target) { catalog.postgres.user_table }
 
     it 'should render table template' do
@@ -883,11 +873,109 @@ describe Masamune::Transform::DefineTable do
           tenant_id INTEGER NOT NULL,
           user_id INTEGER NOT NULL
         );
+      EOS
+    end
+  end
+
+  context 'for postgres table with unique columns and section :post' do
+    before do
+      catalog.schema :postgres do
+        table 'user' do
+          column 'tenant_id', unique: true
+          column 'user_id'
+        end
+      end
+    end
+
+    let(:section) { :post }
+    let(:target) { catalog.postgres.user_table }
+
+    it 'should render table template' do
+      is_expected.to eq <<-EOS.strip_heredoc
+        DO $$ BEGIN
+        IF NOT EXISTS (SELECT 1 FROM pg_class c WHERE c.relname = 'user_table_pkey') THEN
+        ALTER TABLE user_table ADD PRIMARY KEY (id);
+        END IF; END $$;
+
+        DO $$ BEGIN
+        IF NOT EXISTS (SELECT 1 FROM pg_class c WHERE c.relname = 'user_table_3854361_key') THEN
+        ALTER TABLE user_table ADD CONSTRAINT user_table_3854361_key UNIQUE(tenant_id);
+        END IF; END $$;
+
+        ANALYZE user_table;
+      EOS
+    end
+  end
+
+  context 'for postgres table with index columns and section :post' do
+    before do
+      catalog.schema :postgres do
+        table 'user' do
+          column 'tenant_id', index: true
+          column 'user_id', index: true
+        end
+      end
+    end
+
+    let(:section) { :post }
+    let(:target) { catalog.postgres.user_table }
 
+    it 'should render table template' do
+      is_expected.to eq <<-EOS.strip_heredoc
+        DO $$ BEGIN
+        IF NOT EXISTS (SELECT 1 FROM pg_class c WHERE c.relname = 'user_table_pkey') THEN
+        ALTER TABLE user_table ADD PRIMARY KEY (id);
+        END IF; END $$;
+
+        DO $$ BEGIN
+        IF NOT EXISTS (SELECT 1 FROM pg_class c WHERE c.relname = 'user_table_3854361_index') THEN
+        CREATE INDEX user_table_3854361_index ON user_table (tenant_id);
+        END IF; END $$;
+
+        DO $$ BEGIN
+        IF NOT EXISTS (SELECT 1 FROM pg_class c WHERE c.relname = 'user_table_e8701ad_index') THEN
+        CREATE INDEX user_table_e8701ad_index ON user_table (user_id);
+        END IF; END $$;
+
+        ANALYZE user_table;
+      EOS
+    end
+  end
+
+  context 'for postgres table with referenced tables and section :post' do
+    before do
+      catalog.schema :postgres do
+        table 'user_account_state' do
+          column 'name', type: :string, unique: true
+          column 'description', type: :string
+          row name: 'registered', description: 'Registered'
+          row name: 'active', description: 'Active', attributes: { default: true }
+          row name: 'inactive', description: 'Inactive'
+        end
+
+        table 'user' do
+          references :user_account_state
+          column 'name', type: :string
+        end
+      end
+    end
+
+    let(:section) { :post }
+    let(:target) { catalog.postgres.user_table }
+
+    it 'should render table template' do
+      is_expected.to eq <<-EOS.strip_heredoc
         DO $$ BEGIN
         IF NOT EXISTS (SELECT 1 FROM pg_class c WHERE c.relname = 'user_table_pkey') THEN
         ALTER TABLE user_table ADD PRIMARY KEY (id);
         END IF; END $$;
+
+        DO $$ BEGIN
+        IF NOT EXISTS (SELECT 1 FROM pg_constraint c WHERE c.conname = 'user_table_bd2027e_fkey') THEN
+        ALTER TABLE user_table ADD CONSTRAINT user_table_bd2027e_fkey FOREIGN KEY (user_account_state_table_id) REFERENCES user_account_state_table(id);
+        END IF; END $$;
+
+        ANALYZE user_table;
       EOS
     end
   end

data/spec/masamune/transform/denormalize_table_spec.rb

@@ -37,16 +37,19 @@ describe Masamune::Transform::DenormalizeTable do
       end
 
       dimension 'tenant', type: :two do
+        references :cluster, natural_key: true
         column 'tenant_id', type: :integer, index: true, natural_key: true
       end
 
       dimension 'user', type: :two do
+        references :cluster
         column 'tenant_id', type: :integer, index: true, natural_key: true
         column 'user_id', type: :integer, index: true, natural_key: true
         column 'name', type: :string
       end
 
       dimension 'user_agent', type: :mini do
+        references :cluster
         column 'name', type: :string, unique: true, index: 'shared'
         column 'version', type: :string, unique: true, index: 'shared', default: 'Unknown'
         column 'mobile', type: :boolean, unique: true, index: 'shared', default: false
@@ -60,6 +63,7 @@ describe Masamune::Transform::DenormalizeTable do
         references :user, label: 'manager'
         references :user
         references :user_agent
+        references :session, degenerate: true
         measure 'total', type: :integer
       end
     end
@@ -69,6 +73,70 @@ describe Masamune::Transform::DenormalizeTable do
 
   subject(:result) { transform.denormalize_table(target, options).to_s }
 
+  context 'with postgres fact without :columns' do
+    let(:target) { catalog.postgres.visits_fact }
+    let(:options) { { } }
+
+    it 'should eq render denormalize_table template' do
+      is_expected.to eq <<-EOS.strip_heredoc
+      SELECT
+        cluster_type.name AS cluster_type_name,
+        date_dimension.date_id AS date_dimension_date_id,
+        tenant_dimension.tenant_id AS tenant_dimension_tenant_id,
+        manager_user_dimension.tenant_id AS manager_user_dimension_tenant_id,
+        manager_user_dimension.user_id AS manager_user_dimension_user_id,
+        user_dimension.tenant_id AS user_dimension_tenant_id,
+        user_dimension.user_id AS user_dimension_user_id,
+        user_agent_type.name AS user_agent_type_name,
+        user_agent_type.version AS user_agent_type_version,
+        user_agent_type.mobile AS user_agent_type_mobile,
+        session_type_id AS session_type_id,
+        visits_fact.total,
+        visits_fact.time_key
+      FROM
+        visits_fact
+      LEFT JOIN
+        cluster_type
+      ON
+        cluster_type.id = visits_fact.cluster_type_id
+      LEFT JOIN
+        date_dimension
+      ON
+        date_dimension.id = visits_fact.date_dimension_id
+      LEFT JOIN
+        tenant_dimension
+      ON
+        tenant_dimension.id = visits_fact.tenant_dimension_id
+      LEFT JOIN
+        user_dimension AS manager_user_dimension
+      ON
+        manager_user_dimension.id = visits_fact.manager_user_dimension_id
+      LEFT JOIN
+        user_dimension
+      ON
+        user_dimension.id = visits_fact.user_dimension_id
+      LEFT JOIN
+        user_agent_type
+      ON
+        user_agent_type.id = visits_fact.user_agent_type_id
+      ORDER BY
+        cluster_type_name,
+        date_dimension_date_id,
+        tenant_dimension_tenant_id,
+        manager_user_dimension_tenant_id,
+        manager_user_dimension_user_id,
+        user_dimension_tenant_id,
+        user_dimension_user_id,
+        user_agent_type_name,
+        user_agent_type_version,
+        user_agent_type_mobile,
+        session_type_id,
+        total,
+        time_key
+      ;
+      EOS
+    end
+  end
   context 'with postgres fact with :columns' do
     let(:target) { catalog.postgres.visits_fact }
     let(:options) do
@@ -144,8 +212,7 @@ describe Masamune::Transform::DenormalizeTable do
     let(:options) do
       {
         except: [
-          'cluster.name',
-          'last_modified_at'
+          'cluster.name'
         ]
       }
     end
@@ -162,6 +229,7 @@ describe Masamune::Transform::DenormalizeTable do
         user_agent_type.name AS user_agent_type_name,
         user_agent_type.version AS user_agent_type_version,
         user_agent_type.mobile AS user_agent_type_mobile,
+        session_type_id AS session_type_id,
         visits_fact.total,
         visits_fact.time_key
       FROM
@@ -196,6 +264,7 @@ describe Masamune::Transform::DenormalizeTable do
         user_agent_type_name,
         user_agent_type_version,
         user_agent_type_mobile,
+        session_type_id,
         total,
         time_key
       ;

data/spec/masamune/transform/rollup_fact_spec.rb

@@ -156,6 +156,7 @@ describe Masamune::Transform::RollupFact do
 
         ALTER TABLE visits_hourly_fact_y2014m08 INHERIT visits_hourly_fact;
         ALTER TABLE visits_hourly_fact_y2014m08 ADD CONSTRAINT visits_hourly_fact_y2014m08_time_key_check CHECK (time_key >= 1406851200 AND time_key < 1409529600);
+
         ALTER TABLE visits_hourly_fact_y2014m08 ADD CONSTRAINT visits_hourly_fact_y2014m08_d6b9b38_fkey FOREIGN KEY (cluster_type_id) REFERENCES cluster_type(id) NOT VALID DEFERRABLE INITIALLY DEFERRED;
         ALTER TABLE visits_hourly_fact_y2014m08 ADD CONSTRAINT visits_hourly_fact_y2014m08_0a531a8_fkey FOREIGN KEY (date_dimension_id) REFERENCES date_dimension(id) NOT VALID DEFERRABLE INITIALLY DEFERRED;
         ALTER TABLE visits_hourly_fact_y2014m08 ADD CONSTRAINT visits_hourly_fact_y2014m08_d3950d9_fkey FOREIGN KEY (tenant_dimension_id) REFERENCES tenant_dimension(id) NOT VALID DEFERRABLE INITIALLY DEFERRED;
@@ -257,6 +258,7 @@ describe Masamune::Transform::RollupFact do
 
         ALTER TABLE visits_daily_fact_y2014m08 INHERIT visits_daily_fact;
         ALTER TABLE visits_daily_fact_y2014m08 ADD CONSTRAINT visits_daily_fact_y2014m08_time_key_check CHECK (time_key >= 1406851200 AND time_key < 1409529600);
+
         ALTER TABLE visits_daily_fact_y2014m08 ADD CONSTRAINT visits_daily_fact_y2014m08_d6b9b38_fkey FOREIGN KEY (cluster_type_id) REFERENCES cluster_type(id) NOT VALID DEFERRABLE INITIALLY DEFERRED;
         ALTER TABLE visits_daily_fact_y2014m08 ADD CONSTRAINT visits_daily_fact_y2014m08_0a531a8_fkey FOREIGN KEY (date_dimension_id) REFERENCES date_dimension(id) NOT VALID DEFERRABLE INITIALLY DEFERRED;
         ALTER TABLE visits_daily_fact_y2014m08 ADD CONSTRAINT visits_daily_fact_y2014m08_d3950d9_fkey FOREIGN KEY (tenant_dimension_id) REFERENCES tenant_dimension(id) NOT VALID DEFERRABLE INITIALLY DEFERRED;
@@ -358,6 +360,7 @@ describe Masamune::Transform::RollupFact do
 
         ALTER TABLE visits_monthly_fact_y2014m08 INHERIT visits_monthly_fact;
         ALTER TABLE visits_monthly_fact_y2014m08 ADD CONSTRAINT visits_monthly_fact_y2014m08_time_key_check CHECK (time_key >= 1406851200 AND time_key < 1409529600);
+
         ALTER TABLE visits_monthly_fact_y2014m08 ADD CONSTRAINT visits_monthly_fact_y2014m08_d6b9b38_fkey FOREIGN KEY (cluster_type_id) REFERENCES cluster_type(id) NOT VALID DEFERRABLE INITIALLY DEFERRED;
         ALTER TABLE visits_monthly_fact_y2014m08 ADD CONSTRAINT visits_monthly_fact_y2014m08_0a531a8_fkey FOREIGN KEY (date_dimension_id) REFERENCES date_dimension(id) NOT VALID DEFERRABLE INITIALLY DEFERRED;
         ALTER TABLE visits_monthly_fact_y2014m08 ADD CONSTRAINT visits_monthly_fact_y2014m08_d3950d9_fkey FOREIGN KEY (tenant_dimension_id) REFERENCES tenant_dimension(id) NOT VALID DEFERRABLE INITIALLY DEFERRED;

data/spec/masamune/transform/stage_fact_spec.rb

@@ -211,6 +211,7 @@ describe Masamune::Transform::StageFact do
 
         ALTER TABLE visits_hourly_fact_y2014m08 INHERIT visits_hourly_fact;
         ALTER TABLE visits_hourly_fact_y2014m08 ADD CONSTRAINT visits_hourly_fact_y2014m08_time_key_check CHECK (time_key >= 1406851200 AND time_key < 1409529600);
+
         ALTER TABLE visits_hourly_fact_y2014m08 ADD CONSTRAINT visits_hourly_fact_y2014m08_d6b9b38_fkey FOREIGN KEY (cluster_type_id) REFERENCES cluster_type(id) NOT VALID DEFERRABLE INITIALLY DEFERRED;
         ALTER TABLE visits_hourly_fact_y2014m08 ADD CONSTRAINT visits_hourly_fact_y2014m08_0a531a8_fkey FOREIGN KEY (date_dimension_id) REFERENCES date_dimension(id) NOT VALID DEFERRABLE INITIALLY DEFERRED;
         ALTER TABLE visits_hourly_fact_y2014m08 ADD CONSTRAINT visits_hourly_fact_y2014m08_ff74c56_fkey FOREIGN KEY (cluster_type_id, tenant_dimension_id) REFERENCES tenant_dimension(cluster_type_id, id) NOT VALID DEFERRABLE INITIALLY DEFERRED;

data/spec/support/rspec/example/task_example_group.rb

@@ -52,6 +52,23 @@ module TaskExampleGroup
     end
   end
 
+  shared_examples 'executes with success' do
+    it 'exits with status code 0' do
+      expect { cli_invocation }.to raise_error { |e|
+        expect(e).to be_a(SystemExit)
+        expect(e.status).to eq(0)
+      }
+    end
+  end
+
+  shared_examples 'raises Thor::MalformattedArgumentError' do |message|
+    it { expect { cli_invocation }.to raise_error Thor::MalformattedArgumentError, message }
+  end
+
+  shared_examples 'raises Thor::RequiredArgumentMissingError' do |message|
+    it { expect { cli_invocation }.to raise_error Thor::RequiredArgumentMissingError, message }
+  end
+
   def self.included(base)
     base.before :all do
       ENV['THOR_DEBUG'] = '1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: masamune
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
 platform: ruby
 authors:
 - Michael Andrews
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-11 00:00:00.000000000 Z
+date: 2015-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -272,6 +272,7 @@ files:
 - lib/masamune/transform/deduplicate_dimension.rb
 - lib/masamune/transform/define_foreign_key.psql.erb
 - lib/masamune/transform/define_index.psql.erb
+- lib/masamune/transform/define_inheritance.psql.erb
 - lib/masamune/transform/define_schema.hql.erb
 - lib/masamune/transform/define_schema.psql.erb
 - lib/masamune/transform/define_schema.rb