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.

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

add support for postgres drop function statement #1557

Merged
merged 2 commits into from
Jul 6, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Next Next commit
add support for postgres drop function statement
  • Loading branch information
rrrship committed Jun 8, 2022
commit 0d6f57b9a16c4ed382fe7708de7ed432c4f24fcc
26 changes: 26 additions & 0 deletions src/main/java/net/sf/jsqlparser/statement/drop/Drop.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import net.sf.jsqlparser.schema.Table;
import net.sf.jsqlparser.statement.Statement;
Expand All @@ -24,6 +26,7 @@ public class Drop implements Statement {
private String type;
private Table name;
private List<String> parameters;
private Map<String, List<String>> typeToParameters = new HashMap<>();
private boolean ifExists = false;

@Override
Expand Down Expand Up @@ -63,18 +66,41 @@ public void setIfExists(boolean ifExists) {
this.ifExists = ifExists;
}

public Map<String, List<String>> getTypeToParameters() {
return typeToParameters;
}

public void setTypeToParameters(Map<String, List<String>> typeToParameters) {
this.typeToParameters = typeToParameters;
}

@Override
public String toString() {
String sql = "DROP " + type + " "
+ (ifExists ? "IF EXISTS " : "") + name.toString();

if (type.equals("FUNCTION")) {
sql += formatFuncParams(getParamsByType("FUNCTION"));
}

if (parameters != null && !parameters.isEmpty()) {
sql += " " + PlainSelect.getStringList(parameters);
}

return sql;
}

public static String formatFuncParams(List<String> params) {
if (params == null) {
return "";
}
return params.isEmpty() ? "()" : PlainSelect.getStringList(params, true, true);
}

public List<String> getParamsByType(String type) {
return typeToParameters.get(type);
}

public Drop withIfExists(boolean ifExists) {
this.setIfExists(ifExists);
return this;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ public void deParse(Drop drop) {

buffer.append(" ").append(drop.getName());

if (drop.getType().equals("FUNCTION")) {
buffer.append(Drop.formatFuncParams(drop.getParamsByType("FUNCTION")));
}

if (drop.getParameters() != null && !drop.getParameters().isEmpty()) {
buffer.append(" ").append(PlainSelect.getStringList(drop.getParameters()));
}
Expand Down
53 changes: 52 additions & 1 deletion src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
Original file line number Diff line number Diff line change
Expand Up @@ -5396,12 +5396,55 @@ List<String> ColumnsNamesList():
}
}

String FuncArgsListItem():
{
Token tk = null;
String argName = null;
String argType = null;
}
{
(
LOOKAHEAD(2) (
argName = RelObjectName()
argType = RelObjectName()
[ "(" tk = <S_LONG> ")" { argType = argType + "(" + tk.image + ")"; } ]
)
|
(
argType = RelObjectName()
[ "(" tk = <S_LONG> ")" { argType = argType + "(" + tk.image + ")"; } ]
)
)
{
return argName != null ? String.format("%s %s", argName, argType) : argType;
}
}

List<String> FuncArgsList():
{
List<String> retval = null;
String img = null;
}
{
"("
{ retval = new ArrayList<String>(); }
[
img=FuncArgsListItem() { retval.add(img); }
( "," img=FuncArgsListItem() { retval.add(img); } )*
]
")"
{
return retval;
}
}

Drop Drop():
{
Drop drop = new Drop();
Token tk = null;
Table name;
List<String> dropArgs = new ArrayList<String>();
List<String> funcArgs = null;
}
{
<K_DROP>
Expand All @@ -5417,17 +5460,25 @@ Drop Drop():
tk=<K_SCHEMA>
|
tk=<K_SEQUENCE>
|
tk=<K_FUNCTION>
)
{ drop.setType(tk.image); }

[ LOOKAHEAD(2) <K_IF> <K_EXISTS> {drop.setIfExists(true);} ]

name = Table() { drop.setName(name); }
[ funcArgs = FuncArgsList() ]
((tk=<S_IDENTIFIER> | tk=<K_CASCADE> | tk=<K_RESTRICT> ) { dropArgs.add(tk.image); })*

{
if (dropArgs.size() > 0)
if (dropArgs.size() > 0) {
drop.setParameters(dropArgs);
}
if (drop.getType().equals("FUNCTION")) {
drop.getTypeToParameters().put("FUNCTION", funcArgs);
}

return drop;
}
}
Expand Down
25 changes: 25 additions & 0 deletions src/test/java/net/sf/jsqlparser/statement/drop/DropTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -97,4 +97,29 @@ public void testOracleMultiColumnDrop() throws JSQLParserException {
//assertSqlCanBeParsedAndDeparsed("ALTER TABLE foo DROP (bar, baz)");
assertSqlCanBeParsedAndDeparsed("ALTER TABLE foo DROP (bar, baz) CASCADE");
}

@Test
public void testUniqueFunctionDrop() throws JSQLParserException {
assertSqlCanBeParsedAndDeparsed("DROP FUNCTION myFunc");
}

@Test
public void testZeroArgDropFunction() throws JSQLParserException {
assertSqlCanBeParsedAndDeparsed("DROP FUNCTION myFunc()");
}

@Test
public void testDropFunctionWithSimpleType() throws JSQLParserException {
assertSqlCanBeParsedAndDeparsed("DROP FUNCTION myFunc(integer, varchar)");
}

@Test
public void testDropFunctionWithNameAndType() throws JSQLParserException {
assertSqlCanBeParsedAndDeparsed("DROP FUNCTION myFunc(amount integer, name varchar)");
}

@Test
public void testDropFunctionWithNameAndParameterizedType() throws JSQLParserException {
assertSqlCanBeParsedAndDeparsed("DROP FUNCTION myFunc(amount integer, name varchar(255))");
}
}