thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-18 12:22:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: style and MaterializedPostgreSQL test (#3)

Browse Source 
fix: style and MaterializedPostgreSQL test (#3)
This commit is contained in:
jasine 2021-07-14 08:51:14 +08:00 committed by GitHub
parent a0ec8e9878
commit bd59ca22df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.cpp
View File

@ -327,7 +327,8 @@ ASTPtr StorageMaterializedPostgreSQL::getColumnDeclaration(const DataTypePtr & d
return make_decimal_expression("Decimal256"); return make_decimal_expression("Decimal256");
} }
if (which.isDateTime64()){ if (which.isDateTime64())
{
auto ast_expression = std::make_shared<ASTFunction>(); auto ast_expression = std::make_shared<ASTFunction>();
ast_expression->name = "DateTime64"; ast_expression->name = "DateTime64";

2
tests/integration/test_postgresql_replica_database_engine/test.py
View File

@ -236,7 +236,7 @@ def test_different_data_types(started_cluster):
( (
key Integer NOT NULL PRIMARY KEY, key Integer NOT NULL PRIMARY KEY,
a Date[] NOT NULL, -- Date a Date[] NOT NULL, -- Date
b Timestamp[] NOT NULL, -- DateTime64 b Timestamp[] NOT NULL, -- DateTime64(6)
c real[][] NOT NULL, -- Float32 c real[][] NOT NULL, -- Float32
d double precision[][] NOT NULL, -- Float64 d double precision[][] NOT NULL, -- Float64
e decimal(5, 5)[][][] NOT NULL, -- Decimal32 e decimal(5, 5)[][][] NOT NULL, -- Decimal32

12
tests/integration/test_storage_postgresql/test.py
View File

@ -85,10 +85,10 @@ def test_postgres_conversions(started_cluster):
h timestamp, i date, j decimal(5, 3), k numeric, l boolean)''') h timestamp, i date, j decimal(5, 3), k numeric, l boolean)''')
node1.query(''' node1.query('''
INSERT INTO TABLE FUNCTION postgresql('postgres1:5432', 'clickhouse', 'test_types', 'postgres', 'mysecretpassword') VALUES INSERT INTO TABLE FUNCTION postgresql('postgres1:5432', 'clickhouse', 'test_types', 'postgres', 'mysecretpassword') VALUES
(-32768, -2147483648, -9223372036854775808, 1.12345, 1.1234567890, 2147483647, 9223372036854775807, '2000-05-12 12:12:12', '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)''')
result = node1.query(''' result = node1.query('''
SELECT a, b, c, d, e, f, g, h, i, j, toDecimal128(k, 3), l FROM postgresql('postgres1:5432', 'clickhouse', 'test_types', 'postgres', 'mysecretpassword')''') SELECT a, b, c, d, e, f, g, h, i, j, toDecimal128(k, 3), l FROM postgresql('postgres1:5432', 'clickhouse', 'test_types', 'postgres', 'mysecretpassword')''')
assert(result == '-32768\t-2147483648\t-9223372036854775808\t1.12345\t1.123456789\t2147483647\t9223372036854775807\t2000-05-12 12:12:12\t2000-05-12\t22.222\t22.222\t1\n') 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')
cursor.execute("INSERT INTO test_types (l) VALUES (TRUE), (true), ('yes'), ('y'), ('1');") cursor.execute("INSERT INTO test_types (l) VALUES (TRUE), (true), ('yes'), ('y'), ('1');")
cursor.execute("INSERT INTO test_types (l) VALUES (FALSE), (false), ('no'), ('off'), ('0');") cursor.execute("INSERT INTO test_types (l) VALUES (FALSE), (false), ('no'), ('off'), ('0');")
@ -100,7 +100,7 @@ def test_postgres_conversions(started_cluster):
'''CREATE TABLE IF NOT EXISTS test_array_dimensions '''CREATE TABLE IF NOT EXISTS test_array_dimensions
( (
a Date[] NOT NULL, -- Date a Date[] NOT NULL, -- Date
b Timestamp[] NOT NULL, -- DateTime b Timestamp[] NOT NULL, -- DateTime64(6)
c real[][] NOT NULL, -- Float32 c real[][] NOT NULL, -- Float32
d double precision[][] NOT NULL, -- Float64 d double precision[][] NOT NULL, -- Float64
e decimal(5, 5)[][][] NOT NULL, -- Decimal32 e decimal(5, 5)[][][] NOT NULL, -- Decimal32
@ -114,7 +114,7 @@ def test_postgres_conversions(started_cluster):
result = node1.query(''' result = node1.query('''
DESCRIBE TABLE postgresql('postgres1:5432', 'clickhouse', 'test_array_dimensions', 'postgres', 'mysecretpassword')''') DESCRIBE TABLE postgresql('postgres1:5432', 'clickhouse', 'test_array_dimensions', 'postgres', 'mysecretpassword')''')
expected = ('a\tArray(Date)\t\t\t\t\t\n' + expected = ('a\tArray(Date)\t\t\t\t\t\n' +
'b\tArray(DateTime)\t\t\t\t\t\n' + 'b\tArray(DateTime64(6))\t\t\t\t\t\n' +
'c\tArray(Array(Float32))\t\t\t\t\t\n' + 'c\tArray(Array(Float32))\t\t\t\t\t\n' +
'd\tArray(Array(Float64))\t\t\t\t\t\n' + 'd\tArray(Array(Float64))\t\t\t\t\t\n' +
'e\tArray(Array(Array(Decimal(5, 5))))\t\t\t\t\t\n' + 'e\tArray(Array(Array(Decimal(5, 5))))\t\t\t\t\t\n' +
@ -129,7 +129,7 @@ def test_postgres_conversions(started_cluster):
node1.query("INSERT INTO TABLE FUNCTION postgresql('postgres1:5432', 'clickhouse', 'test_array_dimensions', 'postgres', 'mysecretpassword') " node1.query("INSERT INTO TABLE FUNCTION postgresql('postgres1:5432', 'clickhouse', 'test_array_dimensions', 'postgres', 'mysecretpassword') "
"VALUES (" "VALUES ("
"['2000-05-12', '2000-05-12'], " "['2000-05-12', '2000-05-12'], "
"['2000-05-12 12:12:12', '2000-05-12 12:12:12'], " "['2000-05-12 12:12:12.012345', '2000-05-12 12:12:12.012345'], "
"[[1.12345], [1.12345], [1.12345]], " "[[1.12345], [1.12345], [1.12345]], "
"[[1.1234567891], [1.1234567891], [1.1234567891]], " "[[1.1234567891], [1.1234567891], [1.1234567891]], "
"[[[0.11111, 0.11111]], [[0.22222, 0.22222]], [[0.33333, 0.33333]]], " "[[[0.11111, 0.11111]], [[0.22222, 0.22222]], [[0.33333, 0.33333]]], "
@ -144,7 +144,7 @@ def test_postgres_conversions(started_cluster):
SELECT * FROM postgresql('postgres1:5432', 'clickhouse', 'test_array_dimensions', 'postgres', 'mysecretpassword')''') SELECT * FROM postgresql('postgres1:5432', 'clickhouse', 'test_array_dimensions', 'postgres', 'mysecretpassword')''')
expected = ( expected = (
"['2000-05-12','2000-05-12']\t" + "['2000-05-12','2000-05-12']\t" +
"['2000-05-12 12:12:12','2000-05-12 12:12:12']\t" + "['2000-05-12 12:12:12.012345','2000-05-12 12:12:12.012345']\t" +
"[[1.12345],[1.12345],[1.12345]]\t" + "[[1.12345],[1.12345],[1.12345]]\t" +
"[[1.1234567891],[1.1234567891],[1.1234567891]]\t" + "[[1.1234567891],[1.1234567891],[1.1234567891]]\t" +
"[[[0.11111,0.11111]],[[0.22222,0.22222]],[[0.33333,0.33333]]]\t" "[[[0.11111,0.11111]],[[0.22222,0.22222]],[[0.33333,0.33333]]]\t"