mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-11-22 07:31:57 +00:00
Merge pull request #57436 from ryanmjacobs/fix_issue_43186_pg_quote_array_ndims
Fix several issues regarding PostgreSQL `array_ndims` usage.
This commit is contained in:
jsc0218
GitHub
commit
78773157b6
@ -159,6 +159,15 @@ static DataTypePtr convertPostgreSQLDataType(String & type, Fn<void()> auto && r
|
||||
return res;
|
||||
}
|
||||
|
||||
/// Check if PostgreSQL relation is empty.
|
||||
/// postgres_table must be already quoted + schema-qualified.
|
||||
template <typename T>
|
||||
bool isTableEmpty(T & tx, const String & postgres_table)
|
||||
{
|
||||
auto query = fmt::format("SELECT NOT EXISTS (SELECT * FROM {} LIMIT 1);", postgres_table);
|
||||
pqxx::result result{tx.exec(query)};
|
||||
return result[0][0].as<bool>();
|
||||
}
|
||||
|
||||
template<typename T>
|
||||
PostgreSQLTableStructure::ColumnsInfoPtr readNamesAndTypesList(
|
||||
@ -219,12 +228,37 @@ PostgreSQLTableStructure::ColumnsInfoPtr readNamesAndTypesList(
|
||||
{
|
||||
const auto & name_and_type = columns[i];
|
||||
|
||||
/// All rows must contain the same number of dimensions, so limit 1 is ok. If number of dimensions in all rows is not the same -
|
||||
/// If the relation is empty, then array_ndims returns NULL.
|
||||
/// ClickHouse cannot support this use case.
|
||||
if (isTableEmpty(tx, postgres_table))
|
||||
throw Exception(ErrorCodes::BAD_ARGUMENTS, "PostgreSQL relation containing arrays cannot be empty: {}", postgres_table);
|
||||
|
||||
/// All rows must contain the same number of dimensions.
|
||||
/// 1 is ok. If number of dimensions in all rows is not the same -
|
||||
/// such arrays are not able to be used as ClickHouse Array at all.
|
||||
pqxx::result result{tx.exec(fmt::format("SELECT array_ndims({}) FROM {} LIMIT 1", name_and_type.name, postgres_table))};
|
||||
// array_ndims() may return null for empty array, but we expect 0:
|
||||
// https://github.com/postgres/postgres/blob/d16a0c1e2e3874cd5adfa9ee968008b6c4b1ae01/src/backend/utils/adt/arrayfuncs.c#L1658
|
||||
auto dimensions = result[0][0].as<std::optional<int>>().value_or(0);
|
||||
///
|
||||
/// For empty arrays, array_ndims([]) will return NULL.
|
||||
auto postgres_column = doubleQuoteString(name_and_type.name);
|
||||
pqxx::result result{tx.exec(
|
||||
fmt::format("SELECT {} IS NULL, array_ndims({}) FROM {} LIMIT 1;", postgres_column, postgres_column, postgres_table))};
|
||||
|
||||
/// Nullable(Array) is not supported.
|
||||
auto is_null_array = result[0][0].as<bool>();
|
||||
if (is_null_array)
|
||||
throw Exception(ErrorCodes::BAD_ARGUMENTS, "PostgreSQL array cannot be NULL: {}.{}", postgres_table, postgres_column);
|
||||
|
||||
/// Cannot infer dimension of empty arrays.
|
||||
auto is_empty_array = result[0][1].is_null();
|
||||
if (is_empty_array)
|
||||
{
|
||||
throw Exception(
|
||||
ErrorCodes::BAD_ARGUMENTS,
|
||||
"PostgreSQL cannot infer dimensions of an empty array: {}.{}",
|
||||
postgres_table,
|
||||
postgres_column);
|
||||
}
|
||||
|
||||
int dimensions = result[0][1].as<int>();
|
||||
|
||||
/// It is always 1d array if it is in recheck.
|
||||
DataTypePtr type = assert_cast<const DataTypeArray *>(name_and_type.type.get())->getNestedType();
|
||||
|
||||
@ -90,20 +90,20 @@ def test_postgres_conversions(started_cluster):
|
||||
cursor.execute(
|
||||
"""CREATE TABLE test_types (
|
||||
a smallint, b integer, c bigint, d real, e double precision, f serial, g bigserial,
|
||||
h timestamp, i date, j decimal(5, 3), k numeric, l boolean)"""
|
||||
h timestamp, i date, j decimal(5, 3), k numeric, l boolean, "M" integer)"""
|
||||
)
|
||||
node1.query(
|
||||
"""
|
||||
INSERT INTO TABLE FUNCTION postgresql('postgres1:5432', 'postgres', 'test_types', 'postgres', 'mysecretpassword') VALUES
|
||||
(-32768, -2147483648, -9223372036854775808, 1.12345, 1.1234567890, 2147483647, 9223372036854775807, '2000-05-12 12:12:12.012345', '2000-05-12', 22.222, 22.222, 1)"""
|
||||
(-32768, -2147483648, -9223372036854775808, 1.12345, 1.1234567890, 2147483647, 9223372036854775807, '2000-05-12 12:12:12.012345', '2000-05-12', 22.222, 22.222, 1, 42)"""
|
||||
)
|
||||
result = node1.query(
|
||||
"""
|
||||
SELECT a, b, c, d, e, f, g, h, i, j, toDecimal128(k, 3), l FROM postgresql('postgres1:5432', 'postgres', 'test_types', 'postgres', 'mysecretpassword')"""
|
||||
SELECT a, b, c, d, e, f, g, h, i, j, toDecimal128(k, 3), l, "M" FROM postgresql('postgres1:5432', 'postgres', 'test_types', 'postgres', 'mysecretpassword')"""
|
||||
)
|
||||
assert (
|
||||
result
|
||||
== "-32768\t-2147483648\t-9223372036854775808\t1.12345\t1.123456789\t2147483647\t9223372036854775807\t2000-05-12 12:12:12.012345\t2000-05-12\t22.222\t22.222\t1\n"
|
||||
== "-32768\t-2147483648\t-9223372036854775808\t1.12345\t1.123456789\t2147483647\t9223372036854775807\t2000-05-12 12:12:12.012345\t2000-05-12\t22.222\t22.222\t1\t42\n"
|
||||
)
|
||||
|
||||
cursor.execute(
|
||||
@ -132,7 +132,8 @@ def test_postgres_conversions(started_cluster):
|
||||
i Char(2)[][][][], -- Nullable(String)
|
||||
j Char(2)[], -- Nullable(String)
|
||||
k UUID[], -- Nullable(UUID)
|
||||
l UUID[][] -- Nullable(UUID)
|
||||
l UUID[][], -- Nullable(UUID)
|
||||
"M" integer[] NOT NULL -- Int32 (mixed-case identifier)
|
||||
)"""
|
||||
)
|
||||
|
||||
@ -152,7 +153,8 @@ def test_postgres_conversions(started_cluster):
|
||||
"i\tArray(Array(Array(Array(Nullable(String)))))\t\t\t\t\t\n"
|
||||
"j\tArray(Nullable(String))\t\t\t\t\t\n"
|
||||
"k\tArray(Nullable(UUID))\t\t\t\t\t\n"
|
||||
"l\tArray(Array(Nullable(UUID)))"
|
||||
"l\tArray(Array(Nullable(UUID)))\t\t\t\t\t\n"
|
||||
"M\tArray(Int32)"
|
||||
""
|
||||
)
|
||||
assert result.rstrip() == expected
|
||||
@ -171,7 +173,8 @@ def test_postgres_conversions(started_cluster):
|
||||
"[[[[NULL]]]], "
|
||||
"[], "
|
||||
"['2a0c0bfc-4fec-4e32-ae3a-7fc8eea6626a', '42209d53-d641-4d73-a8b6-c038db1e75d6', NULL], "
|
||||
"[[NULL, '42209d53-d641-4d73-a8b6-c038db1e75d6'], ['2a0c0bfc-4fec-4e32-ae3a-7fc8eea6626a', NULL], [NULL, NULL]]"
|
||||
"[[NULL, '42209d53-d641-4d73-a8b6-c038db1e75d6'], ['2a0c0bfc-4fec-4e32-ae3a-7fc8eea6626a', NULL], [NULL, NULL]],"
|
||||
"[42, 42, 42]"
|
||||
")"
|
||||
)
|
||||
|
||||
@ -191,7 +194,8 @@ def test_postgres_conversions(started_cluster):
|
||||
"[[[[NULL]]]]\t"
|
||||
"[]\t"
|
||||
"['2a0c0bfc-4fec-4e32-ae3a-7fc8eea6626a','42209d53-d641-4d73-a8b6-c038db1e75d6',NULL]\t"
|
||||
"[[NULL,'42209d53-d641-4d73-a8b6-c038db1e75d6'],['2a0c0bfc-4fec-4e32-ae3a-7fc8eea6626a',NULL],[NULL,NULL]]\n"
|
||||
"[[NULL,'42209d53-d641-4d73-a8b6-c038db1e75d6'],['2a0c0bfc-4fec-4e32-ae3a-7fc8eea6626a',NULL],[NULL,NULL]]\t"
|
||||
"[42,42,42]\n"
|
||||
)
|
||||
assert result == expected
|
||||
|
||||
@ -199,6 +203,66 @@ def test_postgres_conversions(started_cluster):
|
||||
cursor.execute(f"DROP TABLE test_array_dimensions")
|
||||
|
||||
|
||||
def test_postgres_array_ndim_error_messges(started_cluster):
|
||||
cursor = started_cluster.postgres_conn.cursor()
|
||||
|
||||
# cleanup
|
||||
cursor.execute("DROP VIEW IF EXISTS array_ndim_view;")
|
||||
cursor.execute("DROP TABLE IF EXISTS array_ndim_table;")
|
||||
|
||||
# setup
|
||||
cursor.execute(
|
||||
'CREATE TABLE array_ndim_table (x INTEGER, "Mixed-case with spaces" INTEGER[]);'
|
||||
)
|
||||
cursor.execute("CREATE VIEW array_ndim_view AS SELECT * FROM array_ndim_table;")
|
||||
describe_table = """
|
||||
DESCRIBE TABLE postgresql(
|
||||
'postgres1:5432', 'postgres', 'array_ndim_view',
|
||||
'postgres', 'mysecretpassword'
|
||||
)
|
||||
"""
|
||||
|
||||
# View with array column cannot be empty. Should throw a useful error message.
|
||||
# (Cannot infer array dimension.)
|
||||
try:
|
||||
node1.query(describe_table)
|
||||
assert False
|
||||
except Exception as error:
|
||||
assert (
|
||||
"PostgreSQL relation containing arrays cannot be empty: array_ndim_view"
|
||||
in str(error)
|
||||
)
|
||||
|
||||
# View cannot have empty array. Should throw useful error message.
|
||||
# (Cannot infer array dimension.)
|
||||
cursor.execute("TRUNCATE array_ndim_table;")
|
||||
cursor.execute("INSERT INTO array_ndim_table VALUES (1234, '{}');")
|
||||
try:
|
||||
node1.query(describe_table)
|
||||
assert False
|
||||
except Exception as error:
|
||||
assert (
|
||||
'PostgreSQL cannot infer dimensions of an empty array: array_ndim_view."Mixed-case with spaces"'
|
||||
in str(error)
|
||||
)
|
||||
|
||||
# View cannot have NULL array value. Should throw useful error message.
|
||||
cursor.execute("TRUNCATE array_ndim_table;")
|
||||
cursor.execute("INSERT INTO array_ndim_table VALUES (1234, NULL);")
|
||||
try:
|
||||
node1.query(describe_table)
|
||||
assert False
|
||||
except Exception as error:
|
||||
assert (
|
||||
'PostgreSQL array cannot be NULL: array_ndim_view."Mixed-case with spaces"'
|
||||
in str(error)
|
||||
)
|
||||
|
||||
# cleanup
|
||||
cursor.execute("DROP VIEW IF EXISTS array_ndim_view;")
|
||||
cursor.execute("DROP TABLE IF EXISTS array_ndim_table;")
|
||||
|
||||
|
||||
def test_non_default_schema(started_cluster):
|
||||
node1.query("DROP TABLE IF EXISTS test_pg_table_schema")
|
||||
node1.query("DROP TABLE IF EXISTS test_pg_table_schema_with_dots")
|
||||
|
||||
Loading…
Reference in New Issue
Block a user