Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

24.3.14 Pre-release #544

Open
wants to merge 4 commits into
base: releases/24.3.14
Choose a base branch
from
Open

24.3.14 Pre-release #544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
527cf97
Attempt to fix test_postgresql_replica_database_engine_2/test.py::tes…
Enmk Oct 23, 2024
c01b823
Merge branch 'customizations/24.3.12' into customizations/24.3.14
Enmk Dec 7, 2024
5bcd597
PIn cxx version
MyroTk Dec 14, 2024
5c090db
Merge pull request #564 from Altinity/24.3_pin_cxx_version
Enmk Dec 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions rust/skim/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ edition = "2021"

[dependencies]
skim = { version = "0.10.2", default-features = false }
cxx = "1.0.83"
cxx = "=1.0.83"
term = "0.7.0"

[build-dependencies]
cxx-build = "1.0.83"
cxx-build = "=1.0.83"

[lib]
crate-type = ["staticlib"]
Expand Down
18 changes: 9 additions & 9 deletions tests/integration/helpers/postgres_utility.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,11 @@ def drop_replication_slot(conn, slot_name="user_slot"):

def create_postgres_schema(cursor, schema_name):
drop_postgres_schema(cursor, schema_name)
cursor.execute(f"CREATE SCHEMA {schema_name}")
cursor.execute(f"CREATE SCHEMA `{schema_name}`")


def drop_postgres_schema(cursor, schema_name):
cursor.execute(f"DROP SCHEMA IF EXISTS {schema_name} CASCADE")
cursor.execute(f"DROP SCHEMA IF EXISTS `{schema_name}` CASCADE")


def create_postgres_table(
Expand Down Expand Up @@ -245,9 +245,9 @@ def create_materialized_db(
):
postgres_database = self.database_or_default(postgres_database)
self.created_materialized_postgres_db_list.add(materialized_database)
self.instance.query(f"DROP DATABASE IF EXISTS {materialized_database}")
self.instance.query(f"DROP DATABASE IF EXISTS `{materialized_database}`")

create_query = f"CREATE DATABASE {materialized_database} ENGINE = MaterializedPostgreSQL('{ip}:{port}', '{postgres_database}', '{user}', '{password}')"
create_query = f"CREATE DATABASE `{materialized_database}` ENGINE = MaterializedPostgreSQL('{ip}:{port}', '{postgres_database}', '{user}', '{password}')"
if len(settings) > 0:
create_query += " SETTINGS "
for i in range(len(settings)):
Expand All @@ -259,7 +259,7 @@ def create_materialized_db(
assert materialized_database in self.instance.query("SHOW DATABASES")

def drop_materialized_db(self, materialized_database="test_database"):
self.instance.query(f"DROP DATABASE IF EXISTS {materialized_database} SYNC")
self.instance.query(f"DROP DATABASE IF EXISTS `{materialized_database}` SYNC")
if materialized_database in self.created_materialized_postgres_db_list:
self.created_materialized_postgres_db_list.remove(materialized_database)

Expand Down Expand Up @@ -306,7 +306,7 @@ def create_and_fill_postgres_tables(
if numbers > 0:
db = self.database_or_default(database_name)
self.instance.query(
f"INSERT INTO `{db}`.{table_name} SELECT number, number from numbers({numbers})"
f"INSERT INTO `{db}`.`{table_name}` SELECT number, number from numbers({numbers})"
)


Expand Down Expand Up @@ -342,11 +342,11 @@ def assert_nested_table_is_created(
table = schema_name + "." + table_name

print(f"Checking table {table} exists in {materialized_database}")
database_tables = instance.query(f"SHOW TABLES FROM {materialized_database}")
database_tables = instance.query(f"SHOW TABLES FROM `{materialized_database}`")

while table not in database_tables:
time.sleep(0.2)
database_tables = instance.query(f"SHOW TABLES FROM {materialized_database}")
database_tables = instance.query(f"SHOW TABLES FROM `{materialized_database}`")

assert table in database_tables

Expand Down Expand Up @@ -384,7 +384,7 @@ def check_tables_are_synchronized(
table_path = f"{materialized_database}.`{schema_name}.{table_name}`"

print(f"Checking table is synchronized: {table_path}")
result_query = f"select * from {table_path} order by {order_by};"
result_query = f"select * from `{table_path}` order by {order_by};"

expected = instance.query(
f"select * from `{postgres_database}`.`{table_name}` order by {order_by};"
Expand Down
Loading