thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-23 08:02:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #63826 from ClickHouse/backport/24.3/63787

Browse Source 
Backport #63787 to 24.3: Fix `test_odbc_interaction` for arm64 on linux
This commit is contained in:
robot-ch-test-poll2 2024-05-15 14:09:32 +04:00 committed by GitHub
commit a3c1ba35b1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/integration/helpers/cluster.py
View File

@ -4294,6 +4294,9 @@ class ClickHouseInstance:
) )
return xml_str return xml_str
def get_machine_name(self):
return platform.machine()
@property @property
def odbc_drivers(self): def odbc_drivers(self):
if self.odbc_ini_path: if self.odbc_ini_path:
@ -4301,12 +4304,12 @@ class ClickHouseInstance:
"SQLite3": { "SQLite3": {
"DSN": "sqlite3_odbc", "DSN": "sqlite3_odbc",
"Database": "/tmp/sqliteodbc", "Database": "/tmp/sqliteodbc",
"Driver": "/usr/lib/x86_64-linux-gnu/odbc/libsqlite3odbc.so", "Driver": f"/usr/lib/{self.get_machine_name()}-linux-gnu/odbc/libsqlite3odbc.so",
"Setup": "/usr/lib/x86_64-linux-gnu/odbc/libsqlite3odbc.so", "Setup": f"/usr/lib/{self.get_machine_name()}-linux-gnu/odbc/libsqlite3odbc.so",
}, },
"MySQL": { "MySQL": {
"DSN": "mysql_odbc", "DSN": "mysql_odbc",
"Driver": "/usr/lib/x86_64-linux-gnu/odbc/libmyodbc.so", "Driver": f"/usr/lib/{self.get_machine_name()}-linux-gnu/odbc/libmyodbc.so",
"Database": odbc_mysql_db, "Database": odbc_mysql_db,
"Uid": odbc_mysql_uid, "Uid": odbc_mysql_uid,
"Pwd": odbc_mysql_pass, "Pwd": odbc_mysql_pass,
@ -4323,8 +4326,8 @@ class ClickHouseInstance:
"ReadOnly": "No", "ReadOnly": "No",
"RowVersioning": "No", "RowVersioning": "No",
"ShowSystemTables": "No", "ShowSystemTables": "No",
"Driver": "/usr/lib/x86_64-linux-gnu/odbc/psqlodbca.so", "Driver": f"/usr/lib/{self.get_machine_name()}-linux-gnu/odbc/psqlodbca.so",
"Setup": "/usr/lib/x86_64-linux-gnu/odbc/libodbcpsqlS.so", "Setup": f"/usr/lib/{self.get_machine_name()}-linux-gnu/odbc/libodbcpsqlS.so",
"ConnSettings": "", "ConnSettings": "",
}, },
} }