Skip to content

Commit

Permalink
Test JSONB using DataTypeTest
Browse files Browse the repository at this point in the history
  • Loading branch information
@findepi
findepi committed Mar 13, 2019
1 parent c70d16d commit 6b7f632
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 34 deletions.
64 changes: 34 additions & 30 deletions ...to-postgresql/src/test/java/io/prestosql/plugin/postgresql/TestPostgreSqlTypeMapping.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,14 @@
import static io.prestosql.tests.datatype.DataType.dateDataType;
import static io.prestosql.tests.datatype.DataType.decimalDataType;
import static io.prestosql.tests.datatype.DataType.doubleDataType;
import static io.prestosql.tests.datatype.DataType.formatStringLiteral;
import static io.prestosql.tests.datatype.DataType.integerDataType;
import static io.prestosql.tests.datatype.DataType.jsonDataType;
import static io.prestosql.tests.datatype.DataType.realDataType;
import static io.prestosql.tests.datatype.DataType.smallintDataType;
import static io.prestosql.tests.datatype.DataType.varbinaryDataType;
import static io.prestosql.tests.datatype.DataType.varcharDataType;
import static io.prestosql.type.JsonType.JSON;
import static java.lang.String.format;
import static java.nio.charset.StandardCharsets.UTF_16LE;
import static java.nio.charset.StandardCharsets.UTF_8;
Expand Down Expand Up @@ -292,41 +294,34 @@ public void testTimestamp()
}

@Test
public void jsonDataTypeTest()
public void testJson()
{
DataTypeTest dataTypeTest = DataTypeTest.create()
.addRoundTrip(jsonDataType(), "{}")
.addRoundTrip(jsonDataType(), null)
.addRoundTrip(jsonDataType(), "null")
.addRoundTrip(jsonDataType(), "123.4")
.addRoundTrip(jsonDataType(), "\"abc\"")
.addRoundTrip(jsonDataType(), "\"text with \\\" quotations and ' apostrophes\"")
.addRoundTrip(jsonDataType(), "\"\"")
.addRoundTrip(jsonDataType(), "{\"a\":1,\"b\":2}")
.addRoundTrip(jsonDataType(), "{\"a\":[1,2,3],\"b\":{\"aa\":11,\"bb\":[{\"a\":1,\"b\":2},{\"a\":0}]}}")
.addRoundTrip(jsonDataType(), "[]");

dataTypeTest.execute(getQueryRunner(), prestoCreateAsSelect("presto_test_json"));
dataTypeTest.execute(getQueryRunner(), postgresCreateAndInsert("tpch.postgresql_test_json"));
jsonTestCases(jsonDataType())
.execute(getQueryRunner(), prestoCreateAsSelect("presto_test_json"));
jsonTestCases(jsonDataType())
.execute(getQueryRunner(), postgresCreateAndInsert("tpch.postgresql_test_json"));
}

@Test
public void testJson()
public void testJsonb()
{
JdbcSqlExecutor jdbcSqlExecutor = new JdbcSqlExecutor(postgreSqlServer.getJdbcUrl());
jdbcSqlExecutor.execute("CREATE TABLE tpch.test_json(key varchar(5), json_column json, jsonb_column jsonb)");
try {
assertQuery(
"SELECT column_name, data_type FROM information_schema.columns WHERE table_schema = 'tpch' AND table_name = 'test_json'",
"VALUES ('key','varchar(5)'),('json_column','json'),('jsonb_column','json')");
assertUpdate("INSERT INTO tpch.test_json VALUES ('1', json'{\"x\":123}',json'{\"x\": 123}' )", 1);
assertQuery("SELECT * FROM tpch.test_json", "SELECT '1' \"key\", '{\"x\": 123}' json_column, '{\"x\":123}' jsonb_column");
assertQuery("SELECT * FROM test_json WHERE json_column = json'{\"x\":123}'", "SELECT '1' \"key\", '{\"x\": 123}' json_column, '{\"x\":123}' jsonb_column");
assertUpdate("INSERT INTO test_json VALUES ('1', json'{\"x\":123}',json'{\"x\": 123}' )", 1);
}
finally {
jdbcSqlExecutor.execute("DROP TABLE tpch.test_json");
}
jsonTestCases(jsonbDataType())
.execute(getQueryRunner(), postgresCreateAndInsert("tpch.postgresql_test_jsonb"));
}

private DataTypeTest jsonTestCases(DataType<String> jsonDataType)
{
return DataTypeTest.create()
.addRoundTrip(jsonDataType, "{}")
.addRoundTrip(jsonDataType, null)
.addRoundTrip(jsonDataType, "null")
.addRoundTrip(jsonDataType, "123.4")
.addRoundTrip(jsonDataType, "\"abc\"")
.addRoundTrip(jsonDataType, "\"text with \\\" quotations and ' apostrophes\"")
.addRoundTrip(jsonDataType, "\"\"")
.addRoundTrip(jsonDataType, "{\"a\":1,\"b\":2}")
.addRoundTrip(jsonDataType, "{\"a\":[1,2,3],\"b\":{\"aa\":11,\"bb\":[{\"a\":1,\"b\":2},{\"a\":0}]}}")
.addRoundTrip(jsonDataType, "[]");
}

private void testUnsupportedDataType(String databaseDataType)
Expand All @@ -343,6 +338,15 @@ private void testUnsupportedDataType(String databaseDataType)
}
}

public static DataType<String> jsonbDataType()
{
return dataType(
"jsonb",
JSON,
value -> "JSON " + formatStringLiteral(value),
identity());
}

private static DataType<byte[]> byteaDataType()
{
return dataType(
Expand Down
8 changes: 4 additions & 4 deletions presto-tests/src/main/java/io/prestosql/tests/datatype/DataType.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ private static DataType<String> varcharDataType(Optional<Integer> length, String

public static DataType<String> stringDataType(String insertType, Type prestoResultType)
{
return dataType(insertType, prestoResultType, DataType::quote, Function.identity());
return dataType(insertType, prestoResultType, DataType::formatStringLiteral, Function.identity());
}

public static DataType<String> charDataType(int length)
Expand All @@ -124,7 +124,7 @@ public static DataType<String> charDataType(int length, String properties)

public static DataType<String> charDataType(String insertType, int length)
{
return dataType(insertType, createCharType(length), DataType::quote, input -> padEnd(input, length, ' '));
return dataType(insertType, createCharType(length), DataType::formatStringLiteral, input -> padEnd(input, length, ' '));
}

public static DataType<byte[]> varbinaryDataType()
Expand Down Expand Up @@ -156,11 +156,11 @@ public static DataType<String> jsonDataType()
return dataType(
"json",
JSON,
value -> "JSON " + quote(value),
value -> "JSON " + formatStringLiteral(value),
identity());
}

private static String quote(String value)
public static String formatStringLiteral(String value)
{
return "'" + value.replace("'", "''") + "'";
}
Expand Down

0 comments on commit 6b7f632

Please sign in to comment.