masamune 0.17.11 → 0.17.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bedd64be2e2081da0dcd22d860eb4f502c83268f
-  data.tar.gz: 8ebcbaa4c7c8011b7db7179ab1671e381d35edb4
+  metadata.gz: 1eb266f52acc5ee8e0c52a49902c99818f6f12b5
+  data.tar.gz: d508a06edbd0ee12026452da4d6dcb8bc4d67602
 SHA512:
-  metadata.gz: a952af9940ed6d29d08623df5809b1100b813e3ac602fe4f206c88fc2cc52a9beaedfe4516b40a1ee20af9d665f32716a3e44e5b956a9c442380bdf583ca9e15
-  data.tar.gz: cd3d3bebf7a7e09380244120fb25d20cb019c5544a21a52375e937810b052c1f57d5e34c882cb1e523b132d0f8bfae2183a315e24ed34b93cfd41b101c3aeedd
+  metadata.gz: 3e07e29a9d2ae2f8d30ca1e4955ff0a9be518f99ea6776aabc9ee5410dd79a3b4c99e28b2ce4cc0a772d4c0e7f693b18e6789567f5a8d7b201bf72b5ce9fe3dc
+  data.tar.gz: ae3fddf024a995705f361a0b11de610d1efe7f75e4211dbadcb604cd0ef410f6f5beb7821fdcb6cb3ee0ec3147d243cd8dea6e10485ff9b034646cdd7ef0972f

data/lib/masamune/tasks/dump_thor.rb

@@ -38,6 +38,7 @@ module Masamune::Tasks
     method_option :type, :enum => ['psql', 'hql'], :desc => 'Schema type', :default => 'psql'
     method_option :section, :enum => ['pre', 'post', 'all'], :desc => 'Schema section', :default => 'all'
     method_option :exclude, :type => :array, :desc => 'Exclude tables matching globs', :default => []
+    method_option :skip_indexes, :type => :boolean, :desc => 'Disable indexes', :default => false
     def dump_exec
       print_catalog
       exit
@@ -59,6 +60,7 @@ module Masamune::Tasks
       {
         exclude: options[:exclude],
         section: options[:section].to_sym,
+        skip_indexes: options[:skip_indexes],
         start_date: start_date,
         stop_date: stop_date
       }.reject { |_, v| v.blank? }

data/lib/masamune/transform/define_table.rb

@@ -28,7 +28,7 @@ module Masamune::Transform
       return if target.implicit
       return if exclude_table?(target, options)
       child_tables = target.children.map { |child| define_table(child, options.except(:files)) }
-      Operator.new(*child_tables, __method__, target: target, files: options[:files], section: options[:section]).tap do |operator|
+      Operator.new(*child_tables, __method__, target: target, **options).tap do |operator|
         logger.debug("#{target.id}\n" + operator.to_s) if target.debug
       end
     end

data/lib/masamune/transform/postgres/define_table.rb

@@ -23,9 +23,10 @@
 module Masamune::Transform::Postgres
   class DefineTable 
     def initialize(options = {})
-      @target   = options[:target]
-      @files    = options[:files] || []
-      @section  = options[:section]
+      @target       = options[:target]
+      @files        = options[:files] || []
+      @section      = options[:section]
+      @skip_indexes = options[:skip_indexes]
     end
 
     def locals
@@ -44,6 +45,10 @@ module Masamune::Transform::Postgres
       @section || :all
     end
 
+    def skip_indexes?
+      !!@skip_indexes
+    end
+
     def define_types?
       !post_section?
     end
@@ -73,6 +78,7 @@ module Masamune::Transform::Postgres
 
     def define_indexes?
       return false if pre_section?
+      return false if skip_indexes?
       return true if post_section?
       !target.delay_indexes?
     end

data/lib/masamune/version.rb

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

data/spec/masamune/tasks/dump_thor_spec.rb

@@ -67,6 +67,16 @@ describe Masamune::Tasks::DumpThor do
     it_behaves_like 'raises Thor::MalformattedArgumentError', %q{Expected '--section' to be one of pre, post, all; got unknown}
   end
 
+  context 'with --skip-indexes' do
+    let(:options) { ['--skip-indexes'] }
+    it_behaves_like 'executes with success'
+  end
+
+  context 'with --no-skip-indexes' do
+    let(:options) { ['--no-skip-indexes'] }
+    it_behaves_like 'executes with success'
+  end
+
   context %q{with --exclude='.*dimension'} do
     let(:options) { [%q{--exclude='.*dimension'}] }
     it_behaves_like 'executes with success'

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

@@ -25,7 +25,9 @@ describe Masamune::Transform::DefineTable do
   let(:section) { :all }
   let(:options) { { files: files, section: section } }
 
-  subject { transform.define_table(target, options).to_s }
+  subject do
+    transform.define_table(target, options).to_s
+  end
 
   context 'for postgres table with columns' do
     before do
@@ -1011,4 +1013,29 @@ describe Masamune::Transform::DefineTable do
       EOS
     end
   end
+
+  context 'for postgres table with index columns and section :post and skip_indexes' do
+    before do
+      catalog.schema :postgres do
+        table 'user' do
+          column 'tenant_id', index: true
+          column 'user_id', index: true
+        end
+      end
+    end
+
+    let(:options) { { section: :post, skip_indexes: true } }
+    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 $$;
+
+        ANALYZE user_table;
+      EOS
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: masamune
 version: !ruby/object:Gem::Version
-  version: 0.17.11
+  version: 0.17.12
 platform: ruby
 authors:
 - Michael Andrews
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-06 00:00:00.000000000 Z
+date: 2016-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor