phoedos/pmd
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bug-1520' into pmd/5.3.x

Browse Source
This commit is contained in:
Andreas Dangel
2016-11-04 16:24:48 +01:00
parent 8444b2fea6 d7b8bae1c9
commit 3a46e9bab2
15 changed files with 95 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pmd-plsql/etc/grammar/PldocAST.jjt
View File

@ -27,6 +27,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
/**
* Added ASTIsOfTypeCondition node, added support for USING IN|OUT|IN_OUT
* See PMD Bug #1520
*
* Andreas Dangel 11/2016
*====================================================================
* Adjusted ProgramUnit() to allow Pragma(), even though this is not
* valid syntax. See PMD Bug #1527.
*
@ -1368,7 +1373,7 @@ ASTOpenStatement OpenStatement() :
{
<OPEN> [Expression()]
//[LOOKAHEAD(functionCall()) functionCall() | QualifiedName()]
[<FOR> Expression() [<USING> Expression() ("," Expression())*]]
[<FOR> Expression() [<USING> (<IN> | <OUT> | <IN_OUT>)? Expression() ("," (<IN> | <OUT> | <IN_OUT>)? Expression())*]]
{ return jjtThis ; }
}
@ -1967,13 +1972,28 @@ ASTUnaryExpressionNotPlusMinus UnaryExpressionNotPlusMinus() :
(<NOT>) {sb.append(" NOT "); }
(simpleNode = UnaryExpression(false) ) { sb.append(simpleNode.getImage()); }
|
(simpleNode = PrimaryExpression() ) { sb.append(simpleNode.getImage()); }
(simpleNode = IsOfTypeCondition() ) {sb.append(simpleNode.getImage()); }
)
{
jjtThis.setImage(sb.toString()); return jjtThis;
}
}
ASTIsOfTypeCondition IsOfTypeCondition() :
{ PLSQLNode simpleNode = null; PLSQLNode name = null; StringBuilder sb = new StringBuilder(); }
{
(
LOOKAHEAD(<IDENTIFIER> <IS>)
((name = Name()) {sb.append(name.getImage());} <IS> {sb.append(" IS");} [<NOT> {sb.append(" NOT");}] <OF> {sb.append(" OF");} [<TYPE>]
"(" [<ONLY>] Name() ("," [<ONLY>] Name() )* ")")
|
(simpleNode = PrimaryExpression() ) { sb.append(simpleNode.getImage()); }
)
{
jjtThis.setImage(sb.toString()); return jjtThis;
}
}
/**
* 2006-05-23 - Matthias Hendler - Added lookahead otherwise warning encountered.
* Warning arised while adding methode triggerUnit().
@ -3248,6 +3268,7 @@ TOKEN [IGNORE_CASE]:
* Added: <MERGE: "MERGE">, <AFTER: "AFTER">, <BEFORE: "BEFORE">,
* <INSTEADOF: "INSTEAD OF">, <FOREACHROW: "FOR EACH ROW">, <REFERENCING: "REFERENCING">,
* <OLD: "OLD">, <PARENT: "PARENT">
* 2016-11-04 - Andreas Dangel - Added <ONLY: "ONLY">, <IN_OUT: "IN_OUT">
*/
TOKEN [IGNORE_CASE]:
@ -3347,6 +3368,7 @@ TOKEN [IGNORE_CASE]:
<IF: "IF"> |
<IMMEDIATE: "IMMEDIATE"> |
<IN: "IN"> |
<IN_OUT: "IN_OUT"> |
<INDEX: "INDEX"> |
<INDICES: "INDICES"> |
<INCLUDING: "INCLUDING"> |
@ -3408,6 +3430,7 @@ TOKEN [IGNORE_CASE]:
<OF: "OF"> |
<OID: "OID"> |
<ON: "ON"> |
<ONLY: "ONLY"> |
<OPAQUE: "OPAQUE"> |
<OPEN: "OPEN"> |
<OPERATOR: "OPERATOR"> |

4
pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/PLSQLParserVisitorAdapter.java
View File

@ -690,4 +690,8 @@ public class PLSQLParserVisitorAdapter implements PLSQLParserVisitor {
return visit((PLSQLNode) node, data);
}
@Override
public Object visit(ASTIsOfTypeCondition node, Object data) {
return visit((PLSQLNode) node, data);
}
}

4
pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/AbstractPLSQLRule.java
View File

@ -784,6 +784,10 @@ public abstract class AbstractPLSQLRule extends AbstractRule implements PLSQLPar
public Object visit(ASTAccessibleByClause node, Object data) {
return visit((PLSQLNode) node, data);
}
@Override
public Object visit(ASTIsOfTypeCondition node, Object data) {
return visit((PLSQLNode) node, data);
}
/*
* Treat all Executable Code

10
pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/PLSQLParserTest.java
View File

@ -50,4 +50,14 @@ public class PLSQLParserTest extends AbstractPLSQLParserTst {
public void testBug1527() throws Exception {
parsePLSQL(IOUtils.toString(PLSQLParserTest.class.getResourceAsStream("ast/InlinePragmaProcError.pls")));
}
@Test
public void testBug1520IsOfType() throws Exception {
parsePLSQL(IOUtils.toString(PLSQLParserTest.class.getResourceAsStream("ast/IsOfType.pls")));
}
@Test
public void testBug1520Using() throws Exception {
parsePLSQL(IOUtils.toString(PLSQLParserTest.class.getResourceAsStream("ast/Using.pls")));
}
}

23
pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/IsOfType.pls Normal file
View File

@ -0,0 +1,23 @@
PROCEDURE IsOfType (
inChannelID IN number,
inOperID IN number,
inClientId IN number,
ioFPOobj IN FPO_OBJ,
inPackageIDout IN number,
inStatusId IN number)
is
loFPOGE_OBJ FPOGE_OBJ;
BEGIN
IF ioFPOobj IS OF (FPOGE_OBJ) THEN
loFPOGE_OBJ:=treat(ioFPOobj AS FPOGE_OBJ);
end if;
IF ioFPOobj IS NOT OF TYPE (ONLY FPOGE_OBJ) THEN
loFPOGE_OBJ:=treat(ioFPOobj AS FPOGE_OBJ);
end if;
loFPOGE_OBJ:=SELECT A FROM persons p WHERE IS OF TYPE (employee_t);
loFPOGE_OBJ:=SELECT A FROM persons p WHERE IS NOT OF TYPE (ONLY employee_t, other_t);
end;

16
pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/Using.pls Normal file
View File

@ -0,0 +1,16 @@
/*
* From: https://docs.oracle.com/cd/B13789_01/appdev.101/b10807/13_elems034.htm
*/
DECLARE
TYPE EmpCurTyp IS REF CURSOR; -- define weak REF CURSOR type
emp_cv EmpCurTyp; -- declare cursor variable
my_ename VARCHAR2(15);
my_sal NUMBER := 1000;
BEGIN
OPEN emp_cv FOR -- open cursor variable
'SELECT ename, sal FROM emp WHERE sal > :s' USING my_sal;
open cursor for 'query' USING variable;
open cursor for 'query' USING IN variable;
open cursor for 'query' USING OUT variable, IN othervariable;
open cursor for 'query' USING IN_OUT variable;
END;

4
pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/rule/codesize/xml/ExcessiveMethodLength.xml
View File

@ -1265,7 +1265,7 @@ IS
/** Unreserved Keyword Word ONLINE **/
ONLINE VARCHAR2(240);
/** Unreserved Keyword Word ONLY **/
ONLY VARCHAR2(240);
-- ONLY VARCHAR2(240);
/** Unreserved Keyword Word OPAQUE **/
OPAQUE VARCHAR2(240);
/** Unreserved Keyword Word OPAQUE_TRANSFORM **/
@ -2726,7 +2726,7 @@ BEGIN
OLD := 'OLD' ; -- OLD VARCHAR2(240)
OLD_PUSH_PRED := 'OLD_PUSH_PRED' ; -- OLD_PUSH_PRED VARCHAR2(240)
ONLINE := 'ONLINE' ; -- ONLINE VARCHAR2(240)
ONLY := 'ONLY' ; -- ONLY VARCHAR2(240)
--ONLY := 'ONLY' ; -- ONLY VARCHAR2(240)
--SRT 20110508 OPAQUE := 'OPAQUE' ; -- OPAQUE VARCHAR2(240)
OPAQUE_TRANSFORM := 'OPAQUE_TRANSFORM' ; -- OPAQUE_TRANSFORM VARCHAR2(240)
OPAQUE_XCANONICAL := 'OPAQUE_XCANONICAL' ; -- OPAQUE_XCANONICAL VARCHAR2(240)

2
pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/rule/codesize/xml/ExcessiveObjectLength.xml
View File

@ -1263,7 +1263,7 @@ TYPE typ_unreserved_keywords AS OBJECT
/** Unreserved Keyword Word ONLINE **/
ONLINE VARCHAR2(240),
/** Unreserved Keyword Word ONLY **/
ONLY VARCHAR2(240),
-- ONLY VARCHAR2(240),
/** Unreserved Keyword Word OPAQUE **/
OPAQUE VARCHAR2(240),
/** Unreserved Keyword Word OPAQUE_TRANSFORM **/

2
pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/rule/codesize/xml/ExcessivePackageSpecificationLength.xml
View File

@ -1263,7 +1263,7 @@ PACKAGE pkg_unreserved AS
/** Unreserved Keyword Word ONLINE **/
ONLINE VARCHAR2(240);
/** Unreserved Keyword Word ONLY **/
ONLY VARCHAR2(240);
-- ONLY VARCHAR2(240);
/** Unreserved Keyword Word OPAQUE **/
OPAQUE VARCHAR2(240);
/** Unreserved Keyword Word OPAQUE_TRANSFORM **/

4
pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/rule/codesize/xml/ExcessiveParameterList.xml
View File

@ -1266,7 +1266,7 @@ prc_test_unreserved_keyword
/** Unreserved Keyword Word ONLINE **/
ONLINE IN OUT VARCHAR2,
/** Unreserved Keyword Word ONLY **/
ONLY IN OUT VARCHAR2,
-- ONLY IN OUT VARCHAR2,
/** Unreserved Keyword Word OPAQUE **/
OPAQUE IN OUT VARCHAR2,
/** Unreserved Keyword Word OPAQUE_TRANSFORM **/
@ -2729,7 +2729,7 @@ BEGIN
OLD := 'OLD' ; -- OLD VARCHAR2(240)
OLD_PUSH_PRED := 'OLD_PUSH_PRED' ; -- OLD_PUSH_PRED VARCHAR2(240)
ONLINE := 'ONLINE' ; -- ONLINE VARCHAR2(240)
ONLY := 'ONLY' ; -- ONLY VARCHAR2(240)
-- ONLY := 'ONLY' ; -- ONLY VARCHAR2(240)
--SRT 20110508 OPAQUE := 'OPAQUE' ; -- OPAQUE VARCHAR2(240)
OPAQUE_TRANSFORM := 'OPAQUE_TRANSFORM' ; -- OPAQUE_TRANSFORM VARCHAR2(240)
OPAQUE_XCANONICAL := 'OPAQUE_XCANONICAL' ; -- OPAQUE_XCANONICAL VARCHAR2(240)

2
pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/rule/codesize/xml/ExcessiveTypeLength.xml
View File

@ -1264,7 +1264,7 @@ TYPE typ_unreserved_keywords AS OBJECT
/** Unreserved Keyword Word ONLINE **/
ONLINE VARCHAR2(240),
/** Unreserved Keyword Word ONLY **/
ONLY VARCHAR2(240),
-- ONLY VARCHAR2(240),
/** Unreserved Keyword Word OPAQUE **/
OPAQUE VARCHAR2(240),
/** Unreserved Keyword Word OPAQUE_TRANSFORM **/

4
pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/rule/codesize/xml/NcssMethodCount.xml
View File

@ -1283,7 +1283,7 @@ AS
/** Unreserved Keyword Word ONLINE **/
ONLINE VARCHAR2(240);
/** Unreserved Keyword Word ONLY **/
ONLY VARCHAR2(240);
-- ONLY VARCHAR2(240);
/** Unreserved Keyword Word OPAQUE **/
OPAQUE VARCHAR2(240);
/** Unreserved Keyword Word OPAQUE_TRANSFORM **/
@ -2744,7 +2744,7 @@ BEGIN
OLD := 'OLD' ; -- OLD VARCHAR2(240)
OLD_PUSH_PRED := 'OLD_PUSH_PRED' ; -- OLD_PUSH_PRED VARCHAR2(240)
ONLINE := 'ONLINE' ; -- ONLINE VARCHAR2(240)
ONLY := 'ONLY' ; -- ONLY VARCHAR2(240)
-- ONLY := 'ONLY' ; -- ONLY VARCHAR2(240)
--SRT 20110508 OPAQUE := 'OPAQUE' ; -- OPAQUE VARCHAR2(240)
OPAQUE_TRANSFORM := 'OPAQUE_TRANSFORM' ; -- OPAQUE_TRANSFORM VARCHAR2(240)
OPAQUE_XCANONICAL := 'OPAQUE_XCANONICAL' ; -- OPAQUE_XCANONICAL VARCHAR2(240)

4
pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/rule/codesize/xml/NcssObjectCount.xml
View File

@ -1267,7 +1267,7 @@ AS
/** Unreserved Keyword Word ONLINE **/
ONLINE VARCHAR2(240);
/** Unreserved Keyword Word ONLY **/
ONLY VARCHAR2(240);
-- ONLY VARCHAR2(240);
/** Unreserved Keyword Word OPAQUE **/
OPAQUE VARCHAR2(240);
/** Unreserved Keyword Word OPAQUE_TRANSFORM **/
@ -2740,7 +2740,7 @@ BEGIN
OLD := 'OLD' ; -- OLD VARCHAR2(240)
OLD_PUSH_PRED := 'OLD_PUSH_PRED' ; -- OLD_PUSH_PRED VARCHAR2(240)
ONLINE := 'ONLINE' ; -- ONLINE VARCHAR2(240)
ONLY := 'ONLY' ; -- ONLY VARCHAR2(240)
-- ONLY := 'ONLY' ; -- ONLY VARCHAR2(240)
--SRT 20110508 OPAQUE := 'OPAQUE' ; -- OPAQUE VARCHAR2(240)
OPAQUE_TRANSFORM := 'OPAQUE_TRANSFORM' ; -- OPAQUE_TRANSFORM VARCHAR2(240)
OPAQUE_XCANONICAL := 'OPAQUE_XCANONICAL' ; -- OPAQUE_XCANONICAL VARCHAR2(240)

2
pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/rule/codesize/xml/TooManyFields.xml
View File

@ -1263,7 +1263,7 @@ AS
/** Unreserved Keyword Word ONLINE **/
ONLINE VARCHAR2(240);
/** Unreserved Keyword Word ONLY **/
ONLY VARCHAR2(240);
-- ONLY VARCHAR2(240);
/** Unreserved Keyword Word OPAQUE **/
OPAQUE VARCHAR2(240);
/** Unreserved Keyword Word OPAQUE_TRANSFORM **/

1
src/site/markdown/overview/changelog.md
View File

@ -41,6 +41,7 @@
* java-unusedcode/UnusedModifier
* [#1480](https://sourceforge.net/p/pmd/bugs/1480/): false positive on public modifier used with inner interface in enum
* PLSQL
* [#1520](https://sourceforge.net/p/pmd/bugs/1520/): \[plsql] Missing PL/SQL language constructs in parser: Is Of Type, Using
* [#1527](https://sourceforge.net/p/pmd/bugs/1527/): \[plsql] PRAGMA AUTONOMOUS_TRANSACTION gives processing errors
* [#1531](https://sourceforge.net/p/pmd/bugs/1531/): \[plsql] OOM/Endless loop while parsing (PL)SQL
* General