ridgepole 0.7.0.alpha → 0.7.0.alpha2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c4e5ed48fbd6469287d34ef340f9a3693fc2470
-  data.tar.gz: e9cc11808cd560064217cf5441a875df892ca207
+  metadata.gz: 062b636d39f10f64c5fc0b450021c914121982bc
+  data.tar.gz: 7948f752d4a6165ce5b95926ed910c47b32587af
 SHA512:
-  metadata.gz: ad5e244204d6cad0ea31b7b330813f2086e49881e4773277748beaf5f36de9e2c7a927bad952acdaf87631a1f932aa97ca5c0eaeeafe16bd35b06c5e9604637c
-  data.tar.gz: 4e6abdd8a8fd60bf425cf2431c693f140ddcf7836fd1b5f2353f31aa57f870def2d4c6442e0e144839010a3b8b4bd4d0927428cbb74bf23f821a68939c0fbe4b
+  metadata.gz: aeab93ec074378be562709f3984dee5716381c961aa04e845fe78646cc40ee47a1e57caaad5bed77fd11639c5d3d6ad4db4a7a5e1055e320906cb9d2168a9ea8
+  data.tar.gz: 9fabbad5e5158b4916d1772352ca735a82363a41f11eaadae7776e789644c844dbd87d5b48d8b036cfb9ceb5a08c9bb612171ce1e5af833d4424e7b79a0746a7

data/.rspec

@@ -1,2 +1,3 @@
 --colour
 --require spec_helper
+--format HidePendingFormatter

data/.travis.yml

@@ -1,5 +1,6 @@
 dist: trusty
 sudo: required
+group: edge
 language: ruby
 cache:
   - bundler

data/README.md

@@ -76,6 +76,9 @@ add_foreign_key :articles, :authors # without `name:`
 * `>= 0.7.0`
   * Remove Rails 4.x support
   * Add Rails 5.1 support
+  * Remove `--enable-mysql-awesome` option
+  * Add `--skip-drop-table` option
+  * Support foreign key without name
 
 ## Installation
 
@@ -120,12 +123,12 @@ Usage: ridgepole [options]
         --with-apply
     -o, --output SCHEMAFILE
     -t, --tables TABLES
-        --ignore-tables TABLES
-        --enable-mysql-awesome
+        --ignore-tables REGEX_LIST
         --mysql-use-alter
         --dump-without-table-options
         --dump-with-default-fk-name
         --index-removed-drop-column
+        --skip-drop-table
     -r, --require LIBS
         --log-file LOG_FILE
         --verbose
@@ -358,9 +361,8 @@ Apply `Schemafile`
 docker-compose up -d
 bundle install
 bundle exec appraisal install
-bundle exec appraisal activerecord-4.2 rake
-# ENABLE_MYSQL_AWESOME=1 bundle exec appraisal activerecord-4.2 rake
-# POSTGRESQL=1 bundle exec appraisal activerecord-4.2 rake
+bundle exec appraisal activerecord-5.1 rake
+# POSTGRESQL=1 bundle exec appraisal activerecord-5.1 rake
 ```
 
 **Notice:** mysql-client/postgresql-client is required.

data/bin/ridgepole

@@ -104,20 +104,20 @@ ARGV.options do |opt|
       ARGV.shift
       diff_files = [diff_arg1, diff_arg2]
     }
-    opt.on('',   '--reverse')                     {    options[:reverse] = true                             }
-    opt.on('',   '--with-apply')                  {    diff_with_apply = true                               }
-    opt.on('-o', '--output SCHEMAFILE')           {|v| output_file = v                                      }
-    opt.on('-t', '--tables TABLES', Array)        {|v| options[:tables] = v                                 }
-    opt.on('',   '--ignore-tables TABLES', Array) {|v| options[:ignore_tables] = v.map {|i| Regexp.new(i) } }
-    opt.on('',   '--enable-mysql-awesome')        {    options[:enable_mysql_awesome] = true                }
-    opt.on('',   '--mysql-use-alter')             {    options[:mysql_use_alter] = true                     }
-    opt.on('',   '--dump-without-table-options')  {    options[:dump_without_table_options] = true          }
-    opt.on('',   '--dump-with-default-fk-name')   {    options[:dump_with_default_fk_name] = true           }
-    opt.on('',   '--index-removed-drop-column')   {    options[:index_removed_drop_column] = true           }
-    opt.on('-r', '--require LIBS', Array)         {|v| v.each {|i| require i }                              }
-    opt.on(''  , '--log-file LOG_FILE')           {|v| options[:log_file] = v                               }
-    opt.on(''  , '--verbose')                     {    Ridgepole::Logger.verbose = true                     }
-    opt.on(''  , '--debug')                       {    options[:debug] = true                               }
+    opt.on('',   '--reverse')                         {    options[:reverse] = true                             }
+    opt.on('',   '--with-apply')                      {    diff_with_apply = true                               }
+    opt.on('-o', '--output SCHEMAFILE')               {|v| output_file = v                                      }
+    opt.on('-t', '--tables TABLES', Array)            {|v| options[:tables] = v                                 }
+    opt.on('',   '--ignore-tables REGEX_LIST', Array) {|v| options[:ignore_tables] = v.map {|i| Regexp.new(i) } }
+    opt.on('',   '--mysql-use-alter')                 {    options[:mysql_use_alter] = true                     }
+    opt.on('',   '--dump-without-table-options')      {    options[:dump_without_table_options] = true          }
+    opt.on('',   '--dump-with-default-fk-name')       {    options[:dump_with_default_fk_name] = true           }
+    opt.on('',   '--index-removed-drop-column')       {    options[:index_removed_drop_column] = true           }
+    opt.on('',   '--skip-drop-table')                 {    options[:skip_drop_table] = true                     }
+    opt.on('-r', '--require LIBS', Array)             {|v| v.each {|i| require i }                              }
+    opt.on(''  , '--log-file LOG_FILE')               {|v| options[:log_file] = v                               }
+    opt.on(''  , '--verbose')                         {    Ridgepole::Logger.verbose = true                     }
+    opt.on(''  , '--debug')                           {    options[:debug] = true                               }
 
     opt.on('-v', '--version') {
       puts opt.ver

data/lib/ridgepole/cli/config.rb

@@ -33,7 +33,7 @@ class Ridgepole::Config
     def parse_database_url(config)
       uri = URI.parse(config)
 
-      if [uri.scheme, uri.user, uri.password, uri.host, uri.path].any? {|i| i.nil? }
+      if [uri.scheme, uri.user, uri.host, uri.path].any? {|i| i.nil? }
         raise "Invalid config: #{config.inspect}"
       end
 

data/lib/ridgepole/client.rb

@@ -14,10 +14,6 @@ class Ridgepole::Client
     @parser = Ridgepole::DSLParser.new(@options)
     @diff = Ridgepole::Diff.new(@options)
 
-    if @options[:enable_mysql_awesome]
-      require 'activerecord/mysql/awesome/base'
-    end
-
     if @options[:mysql_use_alter]
       require 'ridgepole/ext/abstract_mysql_adapter/use_alter_index'
     end

data/lib/ridgepole/delta.rb

@@ -244,8 +244,8 @@ end
     end
 
     unless (foreign_keys = attrs[:foreign_keys] || {}).empty?
-      foreign_keys.each do |foreign_key_name, foreign_key_attrs|
-        append_add_foreign_key(table_name, foreign_key_name, foreign_key_attrs, buf_for_fk, @options)
+      foreign_keys.each do |_, foreign_key_attrs|
+        append_add_foreign_key(table_name, foreign_key_attrs, buf_for_fk, @options)
       end
     end
 
@@ -415,16 +415,16 @@ remove_index(#{table_name.inspect}, #{target.inspect})
   end
 
   def append_change_foreign_keys(table_name, delta, buf, options)
-    (delta[:delete] || {}).each do |foreign_key_name, attrs|
-      append_remove_foreign_key(table_name, foreign_key_name, attrs, buf, options)
+    (delta[:delete] || {}).each do |_, attrs|
+      append_remove_foreign_key(table_name, attrs, buf, options)
     end
 
-    (delta[:add] || {}).each do |foreign_key_name, attrs|
-      append_add_foreign_key(table_name, foreign_key_name, attrs, buf, options)
+    (delta[:add] || {}).each do |_, attrs|
+      append_add_foreign_key(table_name, attrs, buf, options)
     end
   end
 
-  def append_add_foreign_key(table_name, foreign_key_name, attrs, buf, options)
+  def append_add_foreign_key(table_name, attrs, buf, options)
     to_table = attrs.fetch(:to_table)
     attrs_options = attrs[:options] || {}
 
@@ -433,9 +433,15 @@ add_foreign_key(#{table_name.inspect}, #{to_table.inspect}, #{attrs_options.insp
     EOS
   end
 
-  def append_remove_foreign_key(table_name, foreign_key_name, attrs, buf, options)
+  def append_remove_foreign_key(table_name, attrs, buf, options)
     attrs_options = attrs[:options] || {}
-    target = {:name => attrs_options.fetch(:name)}
+    fk_name = attrs_options[:name]
+
+    if fk_name
+      target = {:name => fk_name}
+    else
+      target = attrs.fetch(:to_table)
+    end
 
     buf.puts(<<-EOS)
 remove_foreign_key(#{table_name.inspect}, #{target.inspect})

data/lib/ridgepole/diff.rb

@@ -34,7 +34,7 @@ class Ridgepole::Diff
       end
     end
 
-    unless @options[:merge]
+    unless @options[:merge] or @options[:skip_drop_table]
       from.each do |table_name, from_attrs|
         next unless target?(table_name)
 
@@ -55,6 +55,8 @@ class Ridgepole::Diff
       next unless target?(table_name)
 
       if (from_table_name = (to_attrs[:options] || {}).delete(:renamed_from))
+        from_table_name = from_table_name.to_s if from_table_name
+
         # Already renamed
         next if from[table_name]
 
@@ -195,6 +197,8 @@ class Ridgepole::Diff
   def scan_column_rename(from, to, definition_delta)
     to.dup.each do |column_name, to_attrs|
       if (from_column_name = (to_attrs[:options] || {}).delete(:renamed_from))
+        from_column_name = from_column_name.to_s if from_column_name
+
         # Already renamed
         next if from[column_name]
 
@@ -291,7 +295,7 @@ class Ridgepole::Diff
       opts[:default] = nil
     end
 
-    if @options[:enable_mysql_awesome]
+    if Ridgepole::ConnectionAdapters.mysql?
       opts[:unsigned] = false unless opts.has_key?(:unsigned)
     end
   end
@@ -319,29 +323,29 @@ class Ridgepole::Diff
     to = (to || {}).dup
     foreign_keys_delta = {}
 
-    to.each do |foreign_key_name, to_attrs|
-      from_attrs = from.delete(foreign_key_name)
+    to.each do |foreign_key_name_or_tables, to_attrs|
+      from_attrs = from.delete(foreign_key_name_or_tables)
 
       if from_attrs
         if from_attrs != to_attrs
           foreign_keys_delta[:add] ||= {}
-          foreign_keys_delta[:add][foreign_key_name] = to_attrs
+          foreign_keys_delta[:add][foreign_key_name_or_tables] = to_attrs
 
           unless options[:merge]
             foreign_keys_delta[:delete] ||= {}
-            foreign_keys_delta[:delete][foreign_key_name] = from_attrs
+            foreign_keys_delta[:delete][foreign_key_name_or_tables] = from_attrs
           end
         end
       else
         foreign_keys_delta[:add] ||= {}
-        foreign_keys_delta[:add][foreign_key_name] = to_attrs
+        foreign_keys_delta[:add][foreign_key_name_or_tables] = to_attrs
       end
     end
 
     unless options[:merge]
-      from.each do |foreign_key_name, from_attrs|
+      from.each do |foreign_key_name_or_tables, from_attrs|
         foreign_keys_delta[:delete] ||= {}
-        foreign_keys_delta[:delete][foreign_key_name] = from_attrs
+        foreign_keys_delta[:delete][foreign_key_name_or_tables] = from_attrs
       end
     end
 

data/lib/ridgepole/dsl_parser/context.rb

@@ -75,16 +75,12 @@ class Ridgepole::DSLParser
     end
 
     def add_foreign_key(from_table, to_table, options = {})
-      unless options[:name]
-        raise "Foreign key name in `#{from_table}` is undefined"
-      end
-
       from_table = from_table.to_s
       to_table = to_table.to_s
-      options[:name] = options[:name].to_s
+      options[:name] = options[:name].to_s if options[:name]
       @__definition[from_table] ||= {}
       @__definition[from_table][:foreign_keys] ||= {}
-      idx = options[:name]
+      idx = options[:name] || [from_table, to_table]
 
       if @__definition[from_table][:foreign_keys][idx]
         raise "Foreign Key `#{from_table}(#{idx})` already defined"

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.7.0.alpha'
+  VERSION = '0.7.0.alpha2'
 end

data/ridgepole.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.2.7')
+
   spec.add_dependency 'activerecord', '>= 5.0.1', '< 6'
   spec.add_dependency 'diffy'
   spec.add_development_dependency 'bundler'
@@ -26,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'mysql2', '~> 0.3.20'
   spec.add_development_dependency 'pg'
   spec.add_development_dependency 'coveralls'
-  spec.add_development_dependency 'appraisal'
+  spec.add_development_dependency 'appraisal', '>= 2.2.0'
   spec.add_development_dependency 'rspec-match_fuzzy', '>= 0.1.3'
   spec.add_development_dependency 'erbh', '>= 0.1.2'
   spec.add_development_dependency 'hash_modern_inspect', '>= 0.1.1'

data/spec/erb_helper.rb

@@ -9,45 +9,6 @@ ERBh.define_method(:i) do |obj|
   end
 end
 
-ERBh.define_method(:add_index) do |table_name, column_name, options|
-  if options[:length].is_a?(Hash)
-    options[:length] = options[:length].symbolize_keys
-  end
-
-  @_erbout.sub!(/\bend\s*\z/, '')
-
-  # XXX:
-  if not condition('5.0') and options[:using] == :btree
-    options.delete(:using)
-  end
-
-  # XXX:
-  if options.has_key?(:force_using)
-    options[:using] = options.delete(:force_using)
-  end
-
-  <<-EOS
-      t.index #{column_name.inspect}, #{options.modern_inspect_without_brace}
-    end
-  EOS
-end
-
-ERBh.define_method(:unsigned) do |value, *conds|
-  if condition(*conds)
-    {unsigned: value}
-  else
-    {}
-  end
-end
-
-ERBh.define_method(:limit) do |value, *conds|
-  if condition(*conds)
-    {limit: value}
-  else
-    {}
-  end
-end
-
 ERBh.define_method(:cond) do |conds, m, e = nil|
   if condition(*Array(conds))
     m

data/spec/hide_pending_formatter.rb

@@ -0,0 +1,6 @@
+class HidePendingFormatter < RSpec::Core::Formatters::ProgressFormatter
+   RSpec::Core::Formatters.register self, :example_pending
+   RSpec::Core::Formatters.register self, :dump_pending
+   def example_pending(notification); end
+   def dump_pending(notification); end
+end

data/spec/mysql/bigint_pk/bigint_pk_spec.rb

@@ -1,24 +1,24 @@
-describe 'Ridgepole::Client (with bigint pk)', condition: '5.0.' do
+describe 'Ridgepole::Client (with bigint pk)', condition: 5.0 do
   let(:id_primary_key_create_table) {
-    <<-RUBY
+    <<-EOS
       create_table "books", id: :primary_key, limit: 8, force: :cascade do |t|
-        t.string   "title",      null: false
-        t.integer  "author_id",  null: false
+        t.string   "title", null: false
+        t.integer  "author_id", null: false
         t.datetime "created_at"
         t.datetime "updated_at"
       end
-    RUBY
+    EOS
   }
 
   let(:id_bigint_create_table) {
-    <<-RUBY
+    <<-EOS
       create_table "books", id: :bigint, force: :cascade do |t|
-        t.string   "title",      null: false
-        t.integer  "author_id",  null: false
+        t.string   "title", null: false
+        t.integer  "author_id", null: false
         t.datetime "created_at"
         t.datetime "updated_at"
       end
-    RUBY
+    EOS
   }
 
   context 'when with limit:8' do

data/spec/mysql/bigint_pk/int_pk_spec.rb

@@ -1,14 +1,14 @@
-describe 'Ridgepole::Client (with integer pk)', condition: '5.1.' do
+describe 'Ridgepole::Client (with integer pk)', condition: 5.1 do
   context 'when with id:integer' do
     let(:dsl) {
-      <<-RUBY
+      <<-EOS
         create_table "books", id: :integer, force: :cascade do |t|
-          t.string   "title",      null: false
-          t.integer  "author_id",  null: false
+          t.string   "title", null: false
+          t.integer  "author_id", null: false
           t.datetime "created_at"
           t.datetime "updated_at"
         end
-      RUBY
+      EOS
     }
 
     subject { client }
@@ -23,14 +23,14 @@ describe 'Ridgepole::Client (with integer pk)', condition: '5.1.' do
 
   context 'when without id:integer' do
     let(:dsl) {
-      <<-RUBY
+      <<-EOS
         create_table "books", force: :cascade do |t|
-          t.string   "title",      null: false
-          t.integer  "author_id",  null: false
+          t.string   "title", null: false
+          t.integer  "author_id", null: false
           t.datetime "created_at"
           t.datetime "updated_at"
         end
-      RUBY
+      EOS
     }
 
     subject { client }

data/spec/mysql/cli/ridgepole_spec.rb

@@ -39,12 +39,12 @@ describe 'ridgepole' do
             --with-apply
         -o, --output SCHEMAFILE
         -t, --tables TABLES
-            --ignore-tables TABLES
-            --enable-mysql-awesome
+            --ignore-tables REGEX_LIST
             --mysql-use-alter
             --dump-without-table-options
             --dump-with-default-fk-name
             --index-removed-drop-column
+            --skip-drop-table
         -r, --require LIBS
             --log-file LOG_FILE
             --verbose

data/spec/mysql/collation/collation_spec.rb

@@ -2,22 +2,22 @@ describe 'Ridgepole::Client#diff -> migrate' do
   context 'when change column (add collation)' do
     let(:actual_dsl) {
       erbh(<<-EOS)
-        create_table "employee_clubs", <%= i cond('5.1.', id: :bigint) %>, unsigned: true, force: :cascade do |t|
-          t.integer "emp_no",  null: false
+        create_table "employee_clubs", <%= i cond(5.1, id: :bigint) %>, unsigned: true, force: :cascade do |t|
+          t.integer "emp_no", null: false
           t.integer "club_id", null: false, unsigned: true
-          t.string  "string",  null: false, collation: "ascii_bin"
-          t.text    "text",    <%= i cond('5.0.', limit: 65535) %>, null: false
+          t.string  "string", null: false, collation: "ascii_bin"
+          t.text    "text", <%= i cond(5.0, limit: 65535) %>, null: false
         end
       EOS
     }
 
     let(:expected_dsl) {
       erbh(<<-EOS)
-        create_table "employee_clubs", <%= i cond('5.1.', id: :bigint) %>, unsigned: true, force: :cascade do |t|
-          t.integer "emp_no",  null: false
+        create_table "employee_clubs", <%= i cond(5.1, id: :bigint) %>, unsigned: true, force: :cascade do |t|
+          t.integer "emp_no", null: false
           t.integer "club_id", null: false, unsigned: true
-          t.string  "string",  null: false, collation: "ascii_bin"
-          t.text    "text",    <%= i cond('5.0.', limit: 65535) %>, null: false,                 collation: "utf8mb4_bin"
+          t.string  "string", null: false, collation: "ascii_bin"
+          t.text    "text", <%= i cond(5.0, limit: 65535) %>, null: false, collation: "utf8mb4_bin"
         end
       EOS
     }
@@ -37,22 +37,22 @@ describe 'Ridgepole::Client#diff -> migrate' do
   context 'when change column (delete collation)' do
     let(:actual_dsl) {
       erbh(<<-EOS)
-        create_table "employee_clubs", <%= i cond('5.1.', id: :bigint) %>, unsigned: true, force: :cascade do |t|
-          t.integer "emp_no",  null: false
+        create_table "employee_clubs", <%= i cond(5.1, id: :bigint) %>, unsigned: true, force: :cascade do |t|
+          t.integer "emp_no", null: false
           t.integer "club_id", null: false, unsigned: true
-          t.string  "string",  null: false, collation: "ascii_bin"
-          t.text    "text",    <%= i cond('5.0.', limit: 65535) %>, null: false,                 collation: "utf8mb4_bin"
+          t.string  "string", null: false, collation: "ascii_bin"
+          t.text    "text", <%= i cond(5.0, limit: 65535) %>, null: false, collation: "utf8mb4_bin"
         end
       EOS
     }
 
     let(:expected_dsl) {
       erbh(<<-EOS)
-        create_table "employee_clubs", <%= i cond('5.1.', id: :bigint) %>, unsigned: true, force: :cascade do |t|
-          t.integer "emp_no",  null: false
+        create_table "employee_clubs", <%= i cond(5.1, id: :bigint) %>, unsigned: true, force: :cascade do |t|
+          t.integer "emp_no", null: false
           t.integer "club_id", null: false, unsigned: true
-          t.string  "string",  null: false, collation: "ascii_bin"
-          t.text    "text",    <%= i cond('5.0.', limit: 65535) %>, null: false
+          t.string  "string", null: false, collation: "ascii_bin"
+          t.text    "text", <%= i cond(5.0, limit: 65535) %>, null: false
         end
       EOS
     }
@@ -72,22 +72,22 @@ describe 'Ridgepole::Client#diff -> migrate' do
   context 'when change column (change collation)' do
     let(:actual_dsl) {
       erbh(<<-EOS)
-        create_table "employee_clubs", <%= i cond('5.1.', id: :bigint) %>, unsigned: true, force: :cascade do |t|
-          t.integer "emp_no",  null: false
+        create_table "employee_clubs", <%= i cond(5.1, id: :bigint) %>, unsigned: true, force: :cascade do |t|
+          t.integer "emp_no", null: false
           t.integer "club_id", null: false, unsigned: true
-          t.string  "string",  null: false, collation: "ascii_bin"
-          t.text    "text",    <%= i cond('5.0.', limit: 65535) %>, null: false,                 collation: "utf8mb4_bin"
+          t.string  "string", null: false, collation: "ascii_bin"
+          t.text    "text", <%= i cond(5.0, limit: 65535) %>, null: false, collation: "utf8mb4_bin"
         end
       EOS
     }
 
     let(:expected_dsl) {
       erbh(<<-EOS)
-        create_table "employee_clubs", <%= i cond('5.1.', id: :bigint) %>, unsigned: true, force: :cascade do |t|
-          t.integer "emp_no",  null: false
+        create_table "employee_clubs", <%= i cond(5.1, id: :bigint) %>, unsigned: true, force: :cascade do |t|
+          t.integer "emp_no", null: false
           t.integer "club_id", null: false, unsigned: true
-          t.string  "string",  <%= i limit(255) + {null: false, collation: "utf8mb4_bin"} %>
-          t.text    "text",    <%= i cond('5.0.', limit: 65535) %>, null: false,                 collation: "ascii_bin"
+          t.string  "string", null: false, collation: "utf8mb4_bin"
+          t.text    "text", <%= i cond(5.0, limit: 65535) %>, null: false, collation: "ascii_bin"
         end
       EOS
     }
@@ -107,11 +107,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
   context 'when change column (no change collation)' do
     let(:actual_dsl) {
       erbh(<<-EOS)
-        create_table "employee_clubs", <%= i cond('5.1.', id: :bigint) %>, unsigned: true, force: :cascade do |t|
-          t.integer "emp_no",  null: false
+        create_table "employee_clubs", <%= i cond(5.1, id: :bigint) %>, unsigned: true, force: :cascade do |t|
+          t.integer "emp_no", null: false
           t.integer "club_id", null: false, unsigned: true
-          t.string  "string",  null: false, collation: "ascii_bin"
-          t.text    "text",    <%= i cond('5.0.', limit: 65535) %>, null: false,                 collation: "utf8mb4_bin"
+          t.string  "string", null: false, collation: "ascii_bin"
+          t.text    "text", <%= i cond(5.0, limit: 65535) %>, null: false, collation: "utf8mb4_bin"
         end
       EOS
     }