mysql2postgres 0.3.3 → 0.4.1

data/test/fixtures/config_all_options.yml

@@ -1,20 +1,21 @@
 mysql:
-  hostname: localhost
+  hostname: 127.0.0.1
   port: 3306
-  socket: /tmp/mysql.sock
-  username: somename
-  password: secretpassword
+  username: root
+  password: BestPasswordEver
   database: somename
+  encoding: utf8mb4
 
-
-destination:
-  # if file is given, output goes to file, else postgres
-  file: somefile
+# if MYSQL2POSTGRES_ENV and RAILS_ENV is missing, development is used!
+destinations:
+  development:
+    adapter: file
+    filename: /tmp/exported_file.sql
   test:
     hostname: localhost
     port: 5432
-    username: somename
-    password: secretpassword
+    username: postgres
+    password: postgres
     database: somename
 
 # if tables is given, only the listed tables will be converted.  leave empty to convert all tables.
@@ -29,8 +30,10 @@ exclude_tables:
 - table5
 - table6
 
+dump_file_directory: /tmp
+
 # if suppress_data is true, only the schema definition will be exported/migrated, and not the data
-suppress_data: true
+suppress_data: false
 
 # if suppress_ddl is true, only the data will be exported/imported, and not the schema
 suppress_ddl: false

data/test/fixtures/config_min_options.yml

@@ -0,0 +1,16 @@
+mysql:
+  hostname: localhost
+  username: root
+  password: BestPasswordEver
+  database: somename
+
+# if MYSQL2POSTGRES_ENV and RAILS_ENV is missing, development is used!
+destinations:
+  test:
+    hostname: localhost
+    port: 5432
+    username: somename
+    password: secretpassword
+    database: somename
+
+# all options are false as default

data/test/fixtures/config_to_file.yml

@@ -0,0 +1,31 @@
+mysql:
+  hostname: 127.0.0.1
+  port: 3306
+  username: root
+  password: BestPasswordEver
+  database: somename
+  encoding: utf8mb4
+
+# if MYSQL2POSTGRES_ENV and RAILS_ENV is missing, development is used!
+destinations:
+  test:
+    adapter: file
+    filename: /tmp/exported_file.sql
+
+# if tables is given, only the listed tables will be converted.  leave empty to convert all tables.
+tables:
+- table1
+- table2
+- table3
+- table4
+
+dump_file_directory: /tmp
+
+# if suppress_data is true, only the schema definition will be exported/migrated, and not the data
+suppress_data: false
+
+# if suppress_ddl is true, only the data will be exported/imported, and not the schema
+suppress_ddl: false
+
+# if force_truncate is true, forces a table truncate before table loading
+force_truncate: false

data/test/integration/convert_to_db_test.rb

@@ -6,18 +6,25 @@ class ConvertToDbTest < Test::Unit::TestCase
   class << self
     def startup
       seed_test_database
-      @options = get_test_config_by_label :localmysql_to_db_convert_all
-      @mysql2postgres = Mysql2postgres.new @options
-      @mysql2postgres.convert
-      @mysql2postgres.writer.open
     end
+  end
 
-    def shutdown
-      @@mysql2postgres.writer.close
-    end
+  def setup
+    @mysql2postgres = instance_from_file
+    @options = @mysql2postgres.options
+    @options[:force_truncate] = true
+    @options.delete :tables # convert all available tables
+
+    @mysql2postgres.convert
+    @mysql2postgres.writer.connection.open
+  end
+
+  def teardown
+    @mysql2postgres&.writer&.connection&.finish
   end
 
   def test_table_creation
-    assert_true @mysql2postgres.writer.exists?('numeric_types_basics')
+    tables = @mysql2postgres.writer.connection.tables
+    assert tables.include?('numeric_types_basics')
   end
 end

data/test/integration/convert_to_file_test.rb

@@ -3,18 +3,22 @@
 require File.expand_path '../test_helper', __dir__
 
 class ConvertToFileTest < Test::Unit::TestCase
+  attr_reader :content
+
   class << self
     def startup
-      seed_test_database
-      @options = get_test_config_by_label :localmysql_to_file_convert_all
-      @mysql2postgres = Mysql2postgres.new @options
-      @mysql2postgres.convert
-      @content = File.read @mysql2postgres.options[:destfile]
+      seed_test_database option_file: 'config_to_file'
     end
   end
 
-  def content
-    @@content
+  def setup
+    @mysql2postgres = instance_from_file 'config_to_file'
+    @options = @mysql2postgres.options
+    @options[:force_truncate] = true
+    @options.delete :tables # convert all available tables
+
+    @mysql2postgres.convert
+    @content = File.read @mysql2postgres.options[:destination][:filename]
   end
 
   def test_table_creation
@@ -23,46 +27,57 @@ class ConvertToFileTest < Test::Unit::TestCase
   end
 
   def test_basic_numerics_tinyint
-    assert_not_nil Regexp.new('CREATE TABLE "numeric_types_basics".*"f_tinyint" smallint,.*\)', Regexp::MULTILINE).match(content)
+    assert_not_nil Regexp.new('CREATE TABLE "numeric_types_basics".*"f_tinyint" smallint,.*\)', Regexp::MULTILINE)
+                         .match(content)
   end
 
   def test_basic_numerics_smallint
-    assert_not_nil Regexp.new('CREATE TABLE "numeric_types_basics".*"f_smallint" integer,.*\)', Regexp::MULTILINE).match(content)
+    assert_not_nil Regexp.new('CREATE TABLE "numeric_types_basics".*"f_smallint" integer,.*\)', Regexp::MULTILINE)
+                         .match(content)
   end
 
   def test_basic_numerics_mediumint
-    assert_not_nil Regexp.new('CREATE TABLE "numeric_types_basics".*"f_mediumint" integer,.*\)', Regexp::MULTILINE).match(content)
+    assert_not_nil Regexp.new('CREATE TABLE "numeric_types_basics".*"f_mediumint" integer,.*\)', Regexp::MULTILINE)
+                         .match(content)
   end
 
   def test_basic_numerics_int
-    assert_not_nil Regexp.new('CREATE TABLE "numeric_types_basics".*"f_int" integer,.*\)', Regexp::MULTILINE).match(content)
+    assert_not_nil Regexp.new('CREATE TABLE "numeric_types_basics".*"f_int" integer,.*\)', Regexp::MULTILINE)
+                         .match(content)
   end
 
   def test_basic_numerics_integer
-    assert_not_nil Regexp.new('CREATE TABLE "numeric_types_basics".*"f_integer" integer,.*\)', Regexp::MULTILINE).match(content)
+    assert_not_nil Regexp.new('CREATE TABLE "numeric_types_basics".*"f_integer" integer,.*\)', Regexp::MULTILINE)
+                         .match(content)
   end
 
   def test_basic_numerics_bigint
-    assert_not_nil Regexp.new('CREATE TABLE "numeric_types_basics".*"f_bigint" bigint,.*\)', Regexp::MULTILINE).match(content)
+    assert_not_nil Regexp.new('CREATE TABLE "numeric_types_basics".*"f_bigint" bigint,.*\)', Regexp::MULTILINE)
+                         .match(content)
   end
 
   def test_basic_numerics_real
-    assert_not_nil Regexp.new('CREATE TABLE "numeric_types_basics".*"f_real" double precision,.*\)', Regexp::MULTILINE).match(content)
+    assert_not_nil Regexp.new('CREATE TABLE "numeric_types_basics".*"f_real" double precision,.*\)', Regexp::MULTILINE)
+                         .match(content)
   end
 
   def test_basic_numerics_double
-    assert_not_nil Regexp.new('CREATE TABLE "numeric_types_basics".*"f_double" double precision,.*\)', Regexp::MULTILINE).match(content)
+    assert_not_nil Regexp.new('CREATE TABLE "numeric_types_basics".*"f_double" double precision,.*\)', Regexp::MULTILINE)
+                         .match(content)
   end
 
   def test_basic_numerics_float
-    assert_not_nil Regexp.new('CREATE TABLE "numeric_types_basics".*"f_float" double precision,.*\)', Regexp::MULTILINE).match(content)
+    assert_not_nil Regexp.new('CREATE TABLE "numeric_types_basics".*"f_float" double precision,.*\)', Regexp::MULTILINE)
+                         .match(content)
   end
 
   def test_basic_numerics_decimal
-    assert_not_nil Regexp.new('CREATE TABLE "numeric_types_basics".*"f_decimal" numeric\(10, 0\),.*\)', Regexp::MULTILINE).match(content)
+    assert_not_nil Regexp.new('CREATE TABLE "numeric_types_basics".*"f_decimal" numeric\(10, 0\),.*\)', Regexp::MULTILINE)
+                         .match(content)
   end
 
   def test_basic_numerics_numeric
-    assert_not_nil Regexp.new('CREATE TABLE "numeric_types_basics".*"f_numeric" numeric\(10, 0\)[\w\n]*\)', Regexp::MULTILINE).match(content)
+    assert_not_nil Regexp.new('CREATE TABLE "numeric_types_basics".*"f_numeric" numeric\(10, 0\)[\w\n]*\)', Regexp::MULTILINE)
+                         .match(content)
   end
 end

data/test/integration/converter_test.rb

@@ -5,15 +5,22 @@ require File.expand_path '../test_helper', __dir__
 class ConverterTest < Test::Unit::TestCase
   class << self
     def startup
-      seed_test_database
-      @options = get_test_config_by_label :localmysql_to_file_convert_nothing
+      seed_test_database option_file: 'config_to_file'
     end
   end
 
+  def setup
+    @options = options_from_file 'config_to_file'
+    @options[:suppress_data] = true
+    @options[:suppress_ddl] = true
+
+    @destfile = get_temp_file 'mysql2postgres_test'
+  end
+
   def test_new_converter
     assert_nothing_raised do
       reader = get_test_reader @options
-      writer = get_test_file_writer @options
+      writer = Mysql2postgres::PostgresFileWriter.new @destfile, @options[:destination]
       converter = Mysql2postgres::Converter.new reader, writer, @options
       assert_equal 0, converter.convert
     end

data/test/integration/{mysql_reader_base_test.rb → mysql_reader_connection_test.rb}

@@ -2,23 +2,26 @@
 
 require File.expand_path '../test_helper', __dir__
 
-class MysqlReaderBaseTest < Test::Unit::TestCase
+class MysqlReaderConnectionTest < Test::Unit::TestCase
   class << self
     def startup
-      seed_test_database
-      @options = get_test_config_by_label :localmysql_to_file_convert_nothing
+      seed_test_database option_file: 'config_to_file'
     end
   end
 
+  def setup
+    @options = options_from_file 'config_to_file'
+  end
+
   def test_mysql_connection
     assert_nothing_raised do
-      mysql2postgres::MysqlReader.new @options
+      Mysql2postgres::MysqlReader.new @options
     end
   end
 
   def test_mysql_reconnect
     assert_nothing_raised do
-      reader = mysql2postgres::MysqlReader.new @options
+      reader = Mysql2postgres::MysqlReader.new @options
       reader.reconnect
     end
   end
@@ -27,7 +30,7 @@ class MysqlReaderBaseTest < Test::Unit::TestCase
     assert_nothing_raised do
       @options[:mysql][:port] = ''
       @options[:mysql][:socket] = ''
-      mysql2postgres::MysqlReader.new @options
+      Mysql2postgres::MysqlReader.new @options
     end
   end
 end

data/test/integration/mysql_reader_test.rb

@@ -5,12 +5,15 @@ require File.expand_path '../test_helper', __dir__
 class MysqlReaderTest < Test::Unit::TestCase
   class << self
     def startup
-      seed_test_database
-      @options = get_test_config_by_label :localmysql_to_file_convert_nothing
-      @reader = get_test_reader @options
+      seed_test_database option_file: 'config_to_file'
     end
   end
 
+  def setup
+    @options = options_from_file 'config_to_file'
+    @reader = get_test_reader @options
+  end
+
   def test_db_connection
     assert_nothing_raised do
       @reader.mysql.ping
@@ -26,7 +29,7 @@ class MysqlReaderTest < Test::Unit::TestCase
   def test_paginated_read
     expected_rows = 3
     page_size = 2
-    expected_pages = (1.0 * expected_rows / page_size).ceil
+    # expected_pages = (1.0 * expected_rows / page_size).ceil
 
     row_count = my_row_count = 0
     table = @reader.tables.find { |t| t.name == 'numeric_types_basics' }

data/test/integration/postgres_db_writer_test.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require File.expand_path '../test_helper', __dir__
+
+class PostgresDbWriterTest < Test::Unit::TestCase
+  class << self
+    def startup
+      seed_test_database
+    end
+  end
+
+  def setup
+    @options = options_from_file
+    @options[:suppress_data] = true
+    @options[:suppress_ddl] = true
+  end
+
+  def test_pg_connection
+    assert_nothing_raised do
+      Mysql2postgres::PostgresDbWriter.new Tempfile.new('mysql2postgres_test_').path,
+                                           @options[:destination]
+    end
+  end
+end

data/test/test_helper.rb

@@ -4,47 +4,37 @@ require 'rubygems'
 require 'test/unit'
 require 'debug' if ENV.fetch('ENABLE_DEBUG', nil) == '1'
 
-require File.expand_path('../lib/mysql2postgres/version', __dir__)
-require File.expand_path('../lib/mysql2postgres/converter', __dir__)
-require File.expand_path('../lib/mysql2postgres/mysql_reader', __dir__)
-require File.expand_path('../lib/mysql2postgres/writer', __dir__)
-require File.expand_path('../lib/mysql2postgres/postgres_writer', __dir__)
-require File.expand_path('../lib/mysql2postgres/postgres_file_writer', __dir__)
-require File.expand_path('../lib/mysql2postgres/postgres_db_writer', __dir__)
+require File.expand_path('lib/mysql2postgres')
 
-def seed_test_database
-  options = get_test_config_by_label :localmysql_to_file_convert_nothing
-  seedfilepath = "#{__dir__}/../fixtures/seed_integration_tests.sql"
-  rc = system "mysql -u#{options[:mysql][:username]} #{options[:mysql][:database]} < #{seedfilepath}"
-  raise StandardError unless rc
+def load_yaml_file(file = 'config_all_options')
+  YAML.load_file "#{__dir__}/fixtures/#{file}.yml"
+end
 
-  true
-rescue StandardError
-  raise 'Failed to seed integration test db. See README for setup requirements.'
+def instance_from_file(file = 'config_all_options')
+  Mysql2postgres.new load_yaml_file(file)
 end
 
-def get_test_reader(options)
-  require 'mysql2postgres/mysql_reader'
-  mysql2postgres::MysqlReader.new options
-rescue StandardError
-  raise 'Failed to initialize integration test db. See README for setup requirements.'
+def options_from_file(file = 'config_all_options')
+  instance_from_file(file).options
 end
 
-def get_test_file_writer(options)
-  require 'mysql2postgres/postgres_file_writer'
-  mysql2postgres::PostgresFileWriter.new options[:destfile]
-rescue StandardError => e
-  puts e.inspect
-  raise "Failed to initialize file writer from #{options.inspect}. See README for setup requirements."
+def seed_test_database(option_file: 'config_all_options', sql_file: 'seed_integration_tests.sql')
+  options = options_from_file option_file
+  seedfilepath = File.expand_path "test/fixtures/#{sql_file}"
+  system 'mysql ' \
+         "--host #{options[:mysql][:hostname]} " \
+         "--port #{options[:mysql][:port]} " \
+         "-u#{options[:mysql][:username]} " \
+         "-p#{options[:mysql][:password]} " \
+         "#{options[:mysql][:database]} < #{seedfilepath}", exception: true
+rescue StandardError
+  raise 'Failed to seed integration test db. See README for setup requirements.'
 end
 
-def get_test_converter(options)
-  require 'mysql2postgres/converter'
-  reader = get_test_reader options
-  writer = get_test_file_writer options
-  mysql2postgres::Converter.new reader, writer, options
+def get_test_reader(options)
+  Mysql2postgres::MysqlReader.new options
 rescue StandardError
-  raise "Failed to initialize converter from #{options.inspect}. See README for setup requirements."
+  raise 'Failed to initialize integration test db. See README for setup requirements.'
 end
 
 def get_temp_file(basename)
@@ -54,38 +44,3 @@ def get_temp_file(basename)
   f.close!
   path
 end
-
-def get_new_test_config(include_tables: [], exclude_tables: [], to_file: false,
-                        suppress_data: false, suppress_ddl: false, force_truncate: false)
-
-  to_filename = to_file ? get_temp_file(['mysql2postgres_tmp_output_', '.yml']) : nil
-  configtext = Mysql2postgres::Config.template to_filename, include_tables, exclude_tables, suppress_data, suppress_ddl, force_truncate
-  configfile = get_temp_file 'mysql2postgres_tmp_config'
-  File.open(configfile, 'w:UTF-8') { |f| f.write(configtext) }
-  yaml = YAML.load_file configfile
-  Mysql2postgres::ConfigBase.new yaml
-rescue StandardError
-  raise "Failed to initialize options from #{configfile}. See README for setup requirements."
-end
-
-def get_test_config_by_label(name)
-  case name
-  when :localmysql_to_file_convert_nothing
-    get_new_test_config to_file: true,
-                        tables: ['unobtainium'],
-                        exclude_tables: ['kryptonite'],
-                        suppress_data: true,
-                        suppress_ddl: true
-  when :localmysql_to_file_convert_all
-    get_new_test_config to_file: true
-  when :localmysql_to_db_convert_all
-    get_new_test_config
-  when :localmysql_to_db_convert_nothing
-    get_new_test_config tables: ['unobtainium'],
-                        exclude_tables: ['kryptonite'],
-                        suppress_data: true,
-                        suppress_ddl: true
-  else
-    raise "Invalid label: #{name}"
-  end
-end

data/test/units/mysql_test.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require File.expand_path '../test_helper', __dir__
+
+class MysqlTest < Test::Unit::TestCase
+  def test_mysql_charset
+    charset = ::Mysql::Charset.by_number 192
+    assert_equal 'utf8mb3', charset.name
+  end
+end

data/test/units/option_test.rb

@@ -4,14 +4,11 @@ require File.expand_path '../test_helper', __dir__
 require 'yaml'
 
 class SettingTest < Test::Unit::TestCase
-  attr_reader :config_all_opts
-
-  def setup
-    @config_all_opts = YAML.load_file "#{__dir__}/../fixtures/config_all_options.yml"
-  end
-
   def test_options_loaded
-    instance = Mysql2postgres.new @config_all_opts
-    assert_not_nil instance.options
+    options = options_from_file
+
+    assert_equal false, options[:suppress_data]
+    assert_equal 'postgres', options[:destination][:username]
+    assert_equal 'somename', options[:destination][:database]
   end
 end

data/test/units/postgres_file_writer_test.rb

@@ -15,10 +15,12 @@ class PostgresFileWriterTest < Test::Unit::TestCase
     File.delete destfile
   end
 
-  def test_basic_write
-    writer = Mysql2postgres::PostgresFileWriter.new destfile
+  def test_file_writer
+    destination = { filename: '/tmp/test.sql' }
+    writer = Mysql2postgres::PostgresFileWriter.new @destfile, destination
     writer.close
     content = File.read destfile
+
     assert_not_nil content.match("SET client_encoding = 'UTF8'")
     assert_nil content.match('unobtanium')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mysql2postgres
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.1
 platform: ruby
 authors:
 - Max Lapshin <max@maxidoors.ru>
@@ -24,22 +24,8 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-29 00:00:00.000000000 Z
+date: 2023-10-14 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -55,19 +41,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.2.2
 - !ruby/object:Gem::Dependency
-  name: postgres-pr
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-mysql
   requirement: !ruby/object:Gem::Requirement
@@ -82,62 +68,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: debug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.5.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.5.3
 description: Translates MySQL -> PostgreSQL
 email: a.meindl@alphanodes.com
 executables:
@@ -158,20 +88,22 @@ files:
 - lib/mysql2postgres/postgres_file_writer.rb
 - lib/mysql2postgres/postgres_writer.rb
 - lib/mysql2postgres/version.rb
-- lib/mysql2postgres/writer.rb
 - mysql2postgres.gemspec
 - test/fixtures/config_all_options.yml
+- test/fixtures/config_min_options.yml
+- test/fixtures/config_to_file.yml
 - test/fixtures/seed_integration_tests.sql
 - test/integration/convert_to_db_test.rb
 - test/integration/convert_to_file_test.rb
 - test/integration/converter_test.rb
-- test/integration/mysql_reader_base_test.rb
+- test/integration/mysql_reader_connection_test.rb
 - test/integration/mysql_reader_test.rb
-- test/integration/postgres_db_writer_base_test.rb
+- test/integration/postgres_db_writer_test.rb
 - test/test_helper.rb
+- test/units/mysql_test.rb
 - test/units/option_test.rb
 - test/units/postgres_file_writer_test.rb
-homepage: https://code.alphanodes.com/alphanodes/mysql2postgres
+homepage: https://github.com/AlphaNodes/mysql2postgres
 licenses:
 - MIT
 metadata:
@@ -192,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: MySQL to PostgreSQL Data Translation

data/lib/mysql2postgres/writer.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-class Mysql2postgres
-  class Writer
-    def inload
-      raise "Method 'inload' needs to be overridden..."
-    end
-  end
-end