diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-19 14:01:45 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-19 14:01:45 +0300 |
commit | 9297025d0b7ddf095eb618dfaaab2ff8f2018d8b (patch) | |
tree | 865198c01d1824a9b098127baa3ab980c9cd2c06 /spec/support/helpers/click_house_test_helpers.rb | |
parent | 6372471f43ee03c05a7c1f8b0c6ac6b8a7431dbe (diff) |
Add latest changes from gitlab-org/gitlab@16-7-stable-eev16.7.0-rc42
Diffstat (limited to 'spec/support/helpers/click_house_test_helpers.rb')
-rw-r--r-- | spec/support/helpers/click_house_test_helpers.rb | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/spec/support/helpers/click_house_test_helpers.rb b/spec/support/helpers/click_house_test_helpers.rb index 24f81a3ec01..5befeabd82b 100644 --- a/spec/support/helpers/click_house_test_helpers.rb +++ b/spec/support/helpers/click_house_test_helpers.rb @@ -1,12 +1,12 @@ # frozen_string_literal: true module ClickHouseTestHelpers - def migrate(target_version, migration_context) - quietly { migration_context.up(target_version) } + def migrate(migration_context, target_version, step = nil) + quietly { migration_context.up(target_version, step) } end - def rollback(target_version, migration_context) - quietly { migration_context.down(target_version) } + def rollback(migration_context, target_version, step = 1) + quietly { migration_context.down(target_version, step) } end def table_names(database = :main, configuration = ClickHouse::Client.configuration) @@ -36,12 +36,13 @@ module ClickHouseTestHelpers def clear_db(configuration = ClickHouse::Client.configuration) configuration.databases.each_key do |db| + connection = ::ClickHouse::Connection.new(db, configuration) # drop all tables lookup_tables(db, configuration).each do |table| - ClickHouse::Client.execute("DROP TABLE IF EXISTS #{table}", db, configuration) + connection.execute("DROP TABLE IF EXISTS #{table}") end - ClickHouse::MigrationSupport::SchemaMigration.create_table(db, configuration) + ClickHouse::MigrationSupport::SchemaMigration.new(connection).ensure_table end end @@ -71,7 +72,7 @@ module ClickHouseTestHelpers ClickHouse::Migration.verbose = was_verbose end - def clear_consts(fixtures_path) + def unload_click_house_migration_classes(fixtures_path) $LOADED_FEATURES.select { |file| file.include? fixtures_path }.each do |file| const = File.basename(file) .scan(ClickHouse::Migration::MIGRATION_FILENAME_REGEXP)[0][1] |