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

Show security mode in SHOW CREATE VIEW #24297

Merged
merged 1 commit into from
Jan 2, 2025
Merged

Show security mode in SHOW CREATE VIEW #24297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions ...g/src/test/java/com/facebook/presto/iceberg/rest/TestIcebergSmokeRestNestedNamespace.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,10 +339,12 @@ public void testView()
assertUpdate(session, "CREATE VIEW view_orders AS SELECT * from orders");
assertQuery(session, "SELECT * FROM view_orders", "SELECT * from orders");
assertThat(computeActual("SHOW CREATE VIEW view_orders").getOnlyValue())
.isEqualTo(format("CREATE VIEW iceberg.\"%s\".view_orders AS\n" +
"SELECT *\n" +
"FROM\n" +
" orders", schemaName));
.isEqualTo(format("CREATE VIEW iceberg.\"%s\".view_orders SECURITY %s AS\n" +
"SELECT *\n" +
"FROM\n" +
" orders",
schemaName,
"DEFINER"));
assertUpdate(session, "DROP VIEW view_orders");
}

Expand Down
3 changes: 2 additions & 1 deletion presto-main/src/main/java/com/facebook/presto/sql/rewrite/ShowQueriesRewrite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,8 @@ protected Node visitShowCreate(ShowCreate node, Void context)
}

Query query = parseView(viewDefinition.get().getOriginalSql(), objectName, node);
String sql = formatSql(new CreateView(createQualifiedName(objectName), query, false, Optional.empty()), Optional.of(parameters)).trim();
CreateView.Security security = (viewDefinition.get().isRunAsInvoker()) ? CreateView.Security.INVOKER : CreateView.Security.DEFINER;
String sql = formatSql(new CreateView(createQualifiedName(objectName), query, false, Optional.of(security)), Optional.of(parameters)).trim();
return singleValueQuery("Create View", sql);
}

Expand Down
3 changes: 1 addition & 2 deletions presto-parser/src/main/java/com/facebook/presto/sql/SqlFormatter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -583,8 +583,7 @@ protected Void visitCreateView(CreateView node, Integer indent)

node.getSecurity().ifPresent(security ->
builder.append(" SECURITY ")
.append(security.toString())
.append(" "));
.append(security.toString()));

builder.append(" AS\n");

Expand Down
2 changes: 1 addition & 1 deletion presto-spark-base/src/test/java/com/facebook/presto/spark/TestPrestoSparkQueryRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1202,7 +1202,7 @@ public void testCreateAlterTable()
public void testCreateDropView()
{
// create table with default format orc
String createViewSql = "CREATE VIEW hive.hive_test.hive_view AS\n" +
String createViewSql = "CREATE VIEW hive.hive_test.hive_view SECURITY DEFINER AS\n" +
"SELECT *\n" +
"FROM\n" +
" orders";
Expand Down
3 changes: 2 additions & 1 deletion presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestDistributedQueries.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -968,10 +968,11 @@ public void testViewMetadata()

// test SHOW CREATE VIEW
String expectedSql = formatSqlText(format(
"CREATE VIEW %s.%s.%s AS %s",
"CREATE VIEW %s.%s.%s SECURITY %s AS %s",
getSession().getCatalog().get(),
getSession().getSchema().get(),
"meta_test_view",
"DEFINER",
query)).trim();

actual = computeActual("SHOW CREATE VIEW meta_test_view");
Expand Down
Loading