From 9c4486f2fbf0d226b1d41b7fef50a07dcc49f376 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@microdoc.com>
Date: Fri, 20 Jul 2018 15:23:27 +0200
Subject: [PATCH 01/10] [plsql] Add basic support for CursorForLoop statement

---
 pmd-plsql/etc/grammar/PldocAST.jjt            | 20 ++++++++-
 .../plsql/ast/PLSQLParserVisitorAdapter.java  | 10 +++++
 .../lang/plsql/rule/AbstractPLSQLRule.java    | 10 +++++
 .../lang/plsql/AbstractPLSQLParserTst.java    | 11 +++++
 .../pmd/lang/plsql/ast/CursorForLoopTest.java | 44 +++++++++++++++++++
 .../lang/plsql/ast/CursorForLoopNested.pls    | 14 ++++++
 .../lang/plsql/ast/CursorForLoopSimple.pls    | 16 +++++++
 7 files changed, 123 insertions(+), 2 deletions(-)
 create mode 100644 pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/CursorForLoopTest.java
 create mode 100644 pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/CursorForLoopNested.pls
 create mode 100644 pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/CursorForLoopSimple.pls

diff --git a/pmd-plsql/etc/grammar/PldocAST.jjt b/pmd-plsql/etc/grammar/PldocAST.jjt
index 0d162e6bec..16a46143d4 100644
--- a/pmd-plsql/etc/grammar/PldocAST.jjt
+++ b/pmd-plsql/etc/grammar/PldocAST.jjt
@@ -28,6 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /**
  * Added more complete support for CREATE TABLE
+ * Added ASTCursorForLoop and ASTSelectStatement
  *
  * Andreas Dangel 07/2018
  *====================================================================
@@ -1176,6 +1177,7 @@ ASTUnlabelledStatement UnlabelledStatement()  :
 	| LOOKAHEAD(3)  ContinueStatement()  ";" // CONTINUE keyword was added in 11G, so Oracle compilation supports CONTINUE as a variable name
 	| CaseStatement()  ";"
 	| IfStatement()  ";"
+	| LOOKAHEAD(<FOR> ID() <IN> "(" <SELECT>) CursorForLoopStatement() ";"
 	| ForStatement()  ";"
 	| ForAllStatement()  ";"
 	| LoopStatement()  ";"
@@ -1273,6 +1275,20 @@ ASTLoopStatement LoopStatement()  :
       { return jjtThis ; }
 }
 
+ASTCursorForLoopStatement CursorForLoopStatement() :
+{}
+{
+    <FOR> ForIndex() <IN> "(" SelectStatement() ")" <LOOP> (Statement())+ <END> <LOOP> [<IDENTIFIER>]
+    { return jjtThis ; }
+}
+
+ASTSelectStatement SelectStatement() :
+{}
+{
+    SqlStatement(null, ")")
+    { return jjtThis ; }
+}
+
 /** Scope rule: the loop index only exists within the Loop */
 ASTForStatement ForStatement()  :
 {}
@@ -3732,7 +3748,7 @@ TOKEN [IGNORE_CASE]:
  */
 TOKEN :
 {
-< #GERMAN_SPECIAL_CHARACTERS: "Ä" | "Ö" | "Ü" | "ä" | "ü" | "ö" | "ß" >
+< #GERMAN_SPECIAL_CHARACTERS: "Ä" | "Ö" | "Ü" | "ä" | "ü" | "ö" | "ß" >
 |
 < #LETTER: ["A"-"Z"] | ["a"-"z"] | <GERMAN_SPECIAL_CHARACTERS> >
 |
@@ -3745,7 +3761,7 @@ TOKEN :
  | "$" | "&" | "_" | "|" | "{" | "}" | "?" | "[" | "]"
  | " " | "\t" >
 |
-< #SPECIAL_CHARACTERS: "á" | "Ž" | "™" | "š" | "„" | "”" | "ý" | "²" | "€" | "³" | "µ">
+< #SPECIAL_CHARACTERS: "á" | "Ž" | "™" | "š" | "„" | "”" | "ý" | "²" | "€" | "³" | "µ">
 |
 < #DELIMITER: "+" | "%" | "'" | "\"" | "." | "/" | "(" | ")" | ":" | "," | "*" | "=" | "<" | ">" | "@" | ";" | "-">
 |
diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/PLSQLParserVisitorAdapter.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/PLSQLParserVisitorAdapter.java
index 10fc5bc7bb..926da8bd41 100644
--- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/PLSQLParserVisitorAdapter.java
+++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/PLSQLParserVisitorAdapter.java
@@ -710,4 +710,14 @@ public class PLSQLParserVisitorAdapter implements PLSQLParserVisitor {
     public Object visit(ASTReferencesClause node, Object data) {
         return visit((PLSQLNode) node, data);
     }
+
+    @Override
+    public Object visit(ASTCursorForLoopStatement node, Object data) {
+        return visit((PLSQLNode) node, data);
+    }
+
+    @Override
+    public Object visit(ASTSelectStatement node, Object data) {
+        return visit((PLSQLNode) node, data);
+    }
 }
diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/AbstractPLSQLRule.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/AbstractPLSQLRule.java
index afb34fc430..d97ecd8a9e 100644
--- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/AbstractPLSQLRule.java
+++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/AbstractPLSQLRule.java
@@ -805,6 +805,16 @@ public abstract class AbstractPLSQLRule extends AbstractRule implements PLSQLPar
         return visit((PLSQLNode) node, data);
     }
 
+    @Override
+    public Object visit(ASTCursorForLoopStatement node, Object data) {
+        return visit((PLSQLNode) node, data);
+    }
+
+    @Override
+    public Object visit(ASTSelectStatement node, Object data) {
+        return visit((PLSQLNode) node, data);
+    }
+
     /*
      * Treat all Executable Code
      */
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/AbstractPLSQLParserTst.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/AbstractPLSQLParserTst.java
index b9d737e89a..99531494f2 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/AbstractPLSQLParserTst.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/AbstractPLSQLParserTst.java
@@ -4,6 +4,7 @@
 
 package net.sourceforge.pmd.lang.plsql;
 
+import java.io.IOException;
 import java.io.StringReader;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;
@@ -15,6 +16,8 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import org.apache.commons.io.IOUtils;
+
 import net.sourceforge.pmd.lang.LanguageRegistry;
 import net.sourceforge.pmd.lang.LanguageVersion;
 import net.sourceforge.pmd.lang.LanguageVersionHandler;
@@ -127,4 +130,12 @@ public abstract class AbstractPLSQLParserTst {
         return languageVersionHandler.getParser(languageVersionHandler.getDefaultParserOptions()).parse(null,
                 new StringReader(code));
     }
+
+    public String loadTestResource(String name) {
+        try {
+            return IOUtils.toString(this.getClass().getResourceAsStream(name));
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
 }
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/CursorForLoopTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/CursorForLoopTest.java
new file mode 100644
index 0000000000..4f8b0e2cd6
--- /dev/null
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/CursorForLoopTest.java
@@ -0,0 +1,44 @@
+/**
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.plsql.ast;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
+
+public class CursorForLoopTest extends AbstractPLSQLParserTst {
+
+    @Test
+    public void parseCursorForLoopSimple() {
+        String code = loadTestResource("CursorForLoopSimple.pls");
+        ASTInput input = parsePLSQL(code);
+        ASTCursorForLoopStatement forloop = input.getFirstDescendantOfType(ASTCursorForLoopStatement.class);
+        Assert.assertNotNull(forloop);
+        ASTForIndex forindex = forloop.getFirstChildOfType(ASTForIndex.class);
+        Assert.assertNotNull(forindex);
+        Assert.assertEquals("someone", forindex.getImage());
+    }
+
+    @Test
+    public void parseCursorForLoopNested() {
+        String code = loadTestResource("CursorForLoopNested.pls");
+        ASTInput input = parsePLSQL(code);
+        ASTCursorForLoopStatement forloop = input.getFirstDescendantOfType(ASTCursorForLoopStatement.class);
+        Assert.assertNotNull(forloop);
+        ASTForIndex forindex = forloop.getFirstChildOfType(ASTForIndex.class);
+        Assert.assertNotNull(forindex);
+        Assert.assertEquals("c_cmp", forindex.getImage());
+        
+        ASTCursorForLoopStatement forloop2 = forloop.getFirstDescendantOfType(ASTCursorForLoopStatement.class);
+        ASTForIndex forindex2 = forloop2.getFirstChildOfType(ASTForIndex.class);
+        Assert.assertEquals("c_con", forindex2.getImage());
+
+        ASTCursorForLoopStatement forloop3 = forloop2.getFirstDescendantOfType(ASTCursorForLoopStatement.class);
+        ASTForIndex forindex3 = forloop3.getFirstChildOfType(ASTForIndex.class);
+        Assert.assertEquals("c_pa", forindex3.getImage());
+    }
+
+}
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/CursorForLoopNested.pls b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/CursorForLoopNested.pls
new file mode 100644
index 0000000000..8eccf7a602
--- /dev/null
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/CursorForLoopNested.pls
@@ -0,0 +1,14 @@
+--
+-- BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+--
+
+BEGIN
+FOR c_cmp IN (SELECT * FROM companies) LOOP
+  FOR c_con IN (SELECT * FROM contacts) LOOP
+    FOR c_pa IN (SELECT * FROM parties) LOOP
+      NULL;
+    END LOOP;
+  END LOOP;
+END LOOP;
+END;
+/
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/CursorForLoopSimple.pls b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/CursorForLoopSimple.pls
new file mode 100644
index 0000000000..9c43ab8f7d
--- /dev/null
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/CursorForLoopSimple.pls
@@ -0,0 +1,16 @@
+--
+-- BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+--
+
+BEGIN
+FOR someone IN (
+SELECT * FROM employees
+WHERE employee_id < 120
+ORDER BY employee_id
+)
+LOOP
+DBMS_OUTPUT.PUT_LINE('First name = ' || someone.first_name ||
+', Last name = ' || someone.last_name);
+END LOOP;
+END;
+/

From 0b264d5feb828dd8c7dc823a2cafa679d8a20120 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@microdoc.com>
Date: Fri, 20 Jul 2018 15:24:24 +0200
Subject: [PATCH 02/10] Fix encoding (from cp1252 -> utf-8)

---
 pmd-plsql/etc/grammar/PldocAST.jjt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pmd-plsql/etc/grammar/PldocAST.jjt b/pmd-plsql/etc/grammar/PldocAST.jjt
index 16a46143d4..7a6deb3bd6 100644
--- a/pmd-plsql/etc/grammar/PldocAST.jjt
+++ b/pmd-plsql/etc/grammar/PldocAST.jjt
@@ -3761,7 +3761,7 @@ TOKEN :
  | "$" | "&" | "_" | "|" | "{" | "}" | "?" | "[" | "]"
  | " " | "\t" >
 |
-< #SPECIAL_CHARACTERS: "á" | "Ž" | "™" | "š" | "„" | "”" | "ý" | "²" | "€" | "³" | "µ">
+< #SPECIAL_CHARACTERS: "á" | "Ž" | "™" | "š" | "„" | "�" | "ý" | "²" | "€" | "³" | "µ">
 |
 < #DELIMITER: "+" | "%" | "'" | "\"" | "." | "/" | "(" | ")" | ":" | "," | "*" | "=" | "<" | ">" | "@" | ";" | "-">
 |

From 58268812f6309c8e1418e761576ce527b762d8bc Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@microdoc.com>
Date: Fri, 20 Jul 2018 15:26:09 +0200
Subject: [PATCH 03/10] [plsql] New Rule: CursorForLoopNaming

---
 .../main/resources/rulesets/releases/660.xml  |  4 +-
 .../resources/category/plsql/codestyle.xml    | 50 +++++++++++++++++
 .../rule/codestyle/CodeStyleRulesTest.java    |  1 +
 .../codestyle/xml/CursorForLoopNaming.xml     | 56 +++++++++++++++++++
 4 files changed, 110 insertions(+), 1 deletion(-)
 create mode 100644 pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/rule/codestyle/xml/CursorForLoopNaming.xml

diff --git a/pmd-core/src/main/resources/rulesets/releases/660.xml b/pmd-core/src/main/resources/rulesets/releases/660.xml
index bb7d39faf2..a2260a4db1 100644
--- a/pmd-core/src/main/resources/rulesets/releases/660.xml
+++ b/pmd-core/src/main/resources/rulesets/releases/660.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<ruleset name="650"
+<ruleset name="660"
     xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 http://pmd.sourceforge.net/ruleset_2_0_0.xsd">
@@ -10,5 +10,7 @@ This ruleset contains links to rules that are new in PMD v6.6.0
 
     <rule ref="category/java/codestyle.xml/FormalParameterNamingConventions"/>
     <rule ref="category/java/codestyle.xml/LocalVariableNamingConventions"/>
+
+    <rule ref="category/plsql/codestyle.xml/CursorForLoopNaming"/>
 </ruleset>
 
diff --git a/pmd-plsql/src/main/resources/category/plsql/codestyle.xml b/pmd-plsql/src/main/resources/category/plsql/codestyle.xml
index db3b49a7c6..a7431c972c 100644
--- a/pmd-plsql/src/main/resources/category/plsql/codestyle.xml
+++ b/pmd-plsql/src/main/resources/category/plsql/codestyle.xml
@@ -52,4 +52,54 @@ end inline_pragma_error;
         </example>
     </rule>
 
+    <rule name="CursorForLoopNaming"
+          language="plsql"
+          since="6.6.0"
+          message="Use meaniningful names for loop variables"
+          class="net.sourceforge.pmd.lang.rule.XPathRule"
+          externalInfoUrl="${pmd.website.baseurl}/pmd_rules_plsql_codestyle.html#cursorforloopnaming">
+        <description>
+In case you have nested loops please name the loop variables more meaningful.
+        </description>
+        <priority>3</priority>
+        <properties>
+            <property name="xpath">
+                <value>
+<![CDATA[
+//CursorForLoopStatement[
+     Statement//CursorForLoopStatement
+  or ancestor::CursorForLoopStatement
+]/ForIndex[not(starts-with(@Image, 'c_'))]
+]]>
+                </value>
+            </property>
+        </properties>
+        <example>
+<![CDATA[
+-- good example
+BEGIN
+FOR c_cmp IN (SELECT * FROM companies) LOOP
+  FOR c_con IN (SELECT * FROM contacts) LOOP
+    FOR c_pa IN (SELECT * FROM parties) LOOP
+      NULL;
+    END LOOP;
+  END LOOP;
+END LOOP;
+END;
+/
+
+-- bad example
+BEGIN
+FOR c1 IN (SELECT * FROM companies) LOOP
+  FOR c2 IN (SELECT * FROM contacts) LOOP
+    FOR c3 IN (SELECT * FROM parties) LOOP
+      NULL;
+    END LOOP;
+  END LOOP;
+END LOOP;
+END;
+/
+]]>
+        </example>
+    </rule>
 </ruleset>
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/CodeStyleRulesTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/CodeStyleRulesTest.java
index 47e294b3d7..764ae0a7d6 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/CodeStyleRulesTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/CodeStyleRulesTest.java
@@ -13,5 +13,6 @@ public class CodeStyleRulesTest extends SimpleAggregatorTst {
     @Override
     public void setUp() {
         addRule(RULESET, "MisplacedPragma");
+        addRule(RULESET, "CursorForLoopNaming");
     }
 }
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/rule/codestyle/xml/CursorForLoopNaming.xml b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/rule/codestyle/xml/CursorForLoopNaming.xml
new file mode 100644
index 0000000000..d3329fa5d7
--- /dev/null
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/rule/codestyle/xml/CursorForLoopNaming.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<test-data
+    xmlns="http://pmd.sourceforge.net/rule-tests"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://pmd.sourceforge.net/rule-tests http://pmd.sourceforge.net/rule-tests_1_0_0.xsd">
+    <test-code>
+        <description>Simple case</description>
+        <expected-problems>0</expected-problems>
+        <code><![CDATA[
+BEGIN
+FOR c IN (SELECT * FROM companies) LOOP
+  NULL;
+END LOOP;
+END;
+/
+        ]]></code>
+        <source-type>plsql</source-type>
+    </test-code>
+
+    <test-code>
+        <description>Nested loops - good example</description>
+        <expected-problems>0</expected-problems>
+        <code><![CDATA[
+BEGIN
+FOR c_cmp IN (SELECT * FROM companies) LOOP
+  FOR c_con IN (SELECT * FROM contacts) LOOP
+    FOR c_pa IN (SELECT * FROM parties) LOOP
+      NULL;
+    END LOOP;
+  END LOOP;
+END LOOP;
+END;
+/
+        ]]></code>
+        <source-type>plsql</source-type>
+    </test-code>
+
+    <test-code>
+        <description>Nested loops - bad example</description>
+        <expected-problems>3</expected-problems>
+        <expected-linenumbers>2,3,4</expected-linenumbers>
+        <code><![CDATA[
+BEGIN
+FOR c1 IN (SELECT * FROM companies) LOOP
+  FOR c2 IN (SELECT * FROM contacts) LOOP
+    FOR c3 IN (SELECT * FROM parties) LOOP
+      NULL;
+    END LOOP;
+  END LOOP;
+END LOOP;
+END;
+/
+        ]]></code>
+        <source-type>plsql</source-type>
+    </test-code>
+</test-data>
\ No newline at end of file

From ecb1ddb451dc6ac153a5e0083855c2df9dd3b76b Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@adangel.org>
Date: Sun, 15 Jul 2018 13:49:41 +0200
Subject: [PATCH 04/10] [plsql] SELECT INTO with parentheses This fixes
 partially #1047

---
 pmd-plsql/etc/grammar/PldocAST.jjt               |  2 +-
 .../pmd/lang/plsql/ast/CursorForLoopTest.java    | 15 ++++++++++++++-
 .../pmd/lang/plsql/ast/CursorForLoop1047a.pls    | 16 ++++++++++++++++
 .../pmd/lang/plsql/ast/CursorForLoop1047b.pls    | 13 +++++++++++++
 4 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/CursorForLoop1047a.pls
 create mode 100644 pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/CursorForLoop1047b.pls

diff --git a/pmd-plsql/etc/grammar/PldocAST.jjt b/pmd-plsql/etc/grammar/PldocAST.jjt
index 7a6deb3bd6..f265be2476 100644
--- a/pmd-plsql/etc/grammar/PldocAST.jjt
+++ b/pmd-plsql/etc/grammar/PldocAST.jjt
@@ -1285,7 +1285,7 @@ ASTCursorForLoopStatement CursorForLoopStatement() :
 ASTSelectStatement SelectStatement() :
 {}
 {
-    SqlStatement(null, ")")
+    SqlStatement("(", ")")
     { return jjtThis ; }
 }
 
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/CursorForLoopTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/CursorForLoopTest.java
index 4f8b0e2cd6..9eda145cdf 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/CursorForLoopTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/CursorForLoopTest.java
@@ -31,7 +31,7 @@ public class CursorForLoopTest extends AbstractPLSQLParserTst {
         ASTForIndex forindex = forloop.getFirstChildOfType(ASTForIndex.class);
         Assert.assertNotNull(forindex);
         Assert.assertEquals("c_cmp", forindex.getImage());
-        
+
         ASTCursorForLoopStatement forloop2 = forloop.getFirstDescendantOfType(ASTCursorForLoopStatement.class);
         ASTForIndex forindex2 = forloop2.getFirstChildOfType(ASTForIndex.class);
         Assert.assertEquals("c_con", forindex2.getImage());
@@ -41,4 +41,17 @@ public class CursorForLoopTest extends AbstractPLSQLParserTst {
         Assert.assertEquals("c_pa", forindex3.getImage());
     }
 
+    @Test
+    public void parseCursorForLoop1047a() {
+        String code = loadTestResource("CursorForLoop1047a.pls");
+        ASTInput input = parsePLSQL(code);
+        Assert.assertNotNull(input);
+    }
+
+    @Test
+    public void parseCursorForLoop1047b() {
+        String code = loadTestResource("CursorForLoop1047b.pls");
+        ASTInput input = parsePLSQL(code);
+        Assert.assertNotNull(input);
+    }
 }
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/CursorForLoop1047a.pls b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/CursorForLoop1047a.pls
new file mode 100644
index 0000000000..04a27665e4
--- /dev/null
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/CursorForLoop1047a.pls
@@ -0,0 +1,16 @@
+--
+-- BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+--
+
+CREATE OR REPLACE PROCEDURE test2 ( a OUT number, b OUT number )
+ AS
+ BEGIN
+        FOR registro IN ( SELECT  SUM(field1),
+                                  MAX(field2)
+                            INTO a,b
+                            FROM  test_tbl
+                            GROUP BY fieldx)
+        LOOP
+            null;
+        END LOOP;
+END test2;
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/CursorForLoop1047b.pls b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/CursorForLoop1047b.pls
new file mode 100644
index 0000000000..009e39cff9
--- /dev/null
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/CursorForLoop1047b.pls
@@ -0,0 +1,13 @@
+--
+-- BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+--
+
+-- this one was processed without errors
+CREATE OR REPLACE PROCEDURE test2 ( a OUT number, b OUT number )
+ AS
+BEGIN
+        FOR registro IN ( SELECT  SUM(field1),MAX(field2) INTO a,b FROM  test_tbl GROUP BY fieldx )
+        LOOP
+            null;
+        END LOOP;
+END test2;

From 387a8abca9d5b72c3aa418e60a714de81de016db Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@adangel.org>
Date: Sun, 15 Jul 2018 19:17:55 +0200
Subject: [PATCH 05/10] [plsql] Verify issue #681: it's fixed

---
 .../pmd/lang/plsql/ast/CursorForLoopTest.java |  7 +++++++
 .../pmd/lang/plsql/ast/CursorForLoop681.pls   | 20 +++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/CursorForLoop681.pls

diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/CursorForLoopTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/CursorForLoopTest.java
index 9eda145cdf..e3d0a77fc5 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/CursorForLoopTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/CursorForLoopTest.java
@@ -54,4 +54,11 @@ public class CursorForLoopTest extends AbstractPLSQLParserTst {
         ASTInput input = parsePLSQL(code);
         Assert.assertNotNull(input);
     }
+
+    @Test
+    public void parseCursorForLoop681() {
+        String code = loadTestResource("CursorForLoop681.pls");
+        ASTInput input = parsePLSQL(code);
+        Assert.assertNotNull(input);
+    }
 }
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/CursorForLoop681.pls b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/CursorForLoop681.pls
new file mode 100644
index 0000000000..c98deddc3a
--- /dev/null
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/CursorForLoop681.pls
@@ -0,0 +1,20 @@
+--
+-- BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+--
+
+BEGIN
+  FOR sum_res IN (SELECT SUM(loss_reserve) loss_reserve,
+                               SUM(expense_reserve) exp_reserve
+                          FROM gicl_clm_reserve a, gicl_item_peril b
+                         WHERE a.claim_id = b.claim_id
+                           AND a.item_no  = b.item_no
+                           AND a.peril_cd = b.peril_cd
+                           AND a.claim_id = p_claim_id
+                           AND (NVL(b.close_flag, 'AP') IN ('AP','CC','CP') OR 
+                                NVL(b.close_flag2, 'AP') IN ('AP','CC','CP')))
+        LOOP
+           v_loss_res_amt  := sum_res.loss_reserve;
+           v_exp_res_amt   := sum_res.exp_reserve;
+        END LOOP;
+END;
+/

From adb7a42494de3fefb2ce8c41efdf1370a8a8bc61 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@microdoc.com>
Date: Fri, 20 Jul 2018 15:26:48 +0200
Subject: [PATCH 06/10] Update release notes, fixes #681

---
 docs/pages/release_notes.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md
index 23bf24e76d..2bee9484cd 100644
--- a/docs/pages/release_notes.md
+++ b/docs/pages/release_notes.md
@@ -41,6 +41,7 @@ This is a minor release.
 *   java-design
     *   [#1217](https://github.com/pmd/pmd/issues/1217): \[java] CyclomaticComplexityRule counts ?-operator twice
 *   plsql
+    *   [#681](https://github.com/pmd/pmd/issues/681): \[plsql] Parse error with Cursor For Loop
     *   [#980](https://github.com/pmd/pmd/issues/980): \[plsql] ParseException for CREATE TABLE
     *   [#981](https://github.com/pmd/pmd/issues/981): \[plsql] ParseException when parsing VIEW
     *   [#1047](https://github.com/pmd/pmd/issues/1047): \[plsql] ParseException when parsing EXECUTE IMMEDIATE

From b088c20a9654547aa3068018fce920a0be7a47c2 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@microdoc.com>
Date: Fri, 20 Jul 2018 14:49:26 +0200
Subject: [PATCH 07/10] [plsql] CursorForLoopNaming: Add parameters
 "allowSimpleLoops" and "pattern"

---
 .../resources/category/plsql/codestyle.xml    | 15 +++--
 .../codestyle/xml/CursorForLoopNaming.xml     | 61 ++++++++++++++++++-
 2 files changed, 67 insertions(+), 9 deletions(-)

diff --git a/pmd-plsql/src/main/resources/category/plsql/codestyle.xml b/pmd-plsql/src/main/resources/category/plsql/codestyle.xml
index a7431c972c..1d5f51fc9e 100644
--- a/pmd-plsql/src/main/resources/category/plsql/codestyle.xml
+++ b/pmd-plsql/src/main/resources/category/plsql/codestyle.xml
@@ -67,20 +67,23 @@ In case you have nested loops please name the loop variables more meaningful.
                 <value>
 <![CDATA[
 //CursorForLoopStatement[
-     Statement//CursorForLoopStatement
-  or ancestor::CursorForLoopStatement
-]/ForIndex[not(starts-with(@Image, 'c_'))]
+    $allowSimpleLoops = 'false' or
+    (Statement//CursorForLoopStatement or ancestor::CursorForLoopStatement)
+]
+/ForIndex[not(matches(@Image, $pattern))]
 ]]>
                 </value>
             </property>
+            <property name="allowSimpleLoops" type="Boolean" description="Ignore simple loops, that are not nested" value="false" />
+            <property name="pattern" type="Regex" description="The pattern used for the loop variable" value="[a-zA-Z_0-9]{5,}" />
         </properties>
         <example>
 <![CDATA[
 -- good example
 BEGIN
-FOR c_cmp IN (SELECT * FROM companies) LOOP
-  FOR c_con IN (SELECT * FROM contacts) LOOP
-    FOR c_pa IN (SELECT * FROM parties) LOOP
+FOR company IN (SELECT * FROM companies) LOOP
+  FOR contact IN (SELECT * FROM contacts) LOOP
+    FOR party IN (SELECT * FROM parties) LOOP
       NULL;
     END LOOP;
   END LOOP;
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/rule/codestyle/xml/CursorForLoopNaming.xml b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/rule/codestyle/xml/CursorForLoopNaming.xml
index d3329fa5d7..3fb82f933a 100644
--- a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/rule/codestyle/xml/CursorForLoopNaming.xml
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/rule/codestyle/xml/CursorForLoopNaming.xml
@@ -3,8 +3,24 @@
     xmlns="http://pmd.sourceforge.net/rule-tests"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://pmd.sourceforge.net/rule-tests http://pmd.sourceforge.net/rule-tests_1_0_0.xsd">
+
     <test-code>
-        <description>Simple case</description>
+        <description>Simple case - no nesting</description>
+        <expected-problems>1</expected-problems>
+        <code><![CDATA[
+BEGIN
+FOR c IN (SELECT * FROM companies) LOOP
+  NULL;
+END LOOP;
+END;
+/
+        ]]></code>
+        <source-type>plsql</source-type>
+    </test-code>
+
+    <test-code>
+        <description>Simple case - no nesting</description>
+        <rule-property name="allowSimpleLoops">true</rule-property>
         <expected-problems>0</expected-problems>
         <code><![CDATA[
 BEGIN
@@ -18,7 +34,26 @@ END;
     </test-code>
 
     <test-code>
-        <description>Nested loops - good example</description>
+        <description>Nested loops - good example, default pattern</description>
+        <expected-problems>0</expected-problems>
+        <code><![CDATA[
+BEGIN
+FOR company IN (SELECT * FROM companies) LOOP
+  FOR contact IN (SELECT * FROM contacts) LOOP
+    FOR party IN (SELECT * FROM parties) LOOP
+      NULL;
+    END LOOP;
+  END LOOP;
+END LOOP;
+END;
+/
+        ]]></code>
+        <source-type>plsql</source-type>
+    </test-code>
+
+    <test-code>
+        <description>Nested loops - good example, special pattern</description>
+        <rule-property name="pattern">c_[a-z]+</rule-property>
         <expected-problems>0</expected-problems>
         <code><![CDATA[
 BEGIN
@@ -36,7 +71,27 @@ END;
     </test-code>
 
     <test-code>
-        <description>Nested loops - bad example</description>
+        <description>Nested loops - bad example, default pattern</description>
+        <expected-problems>3</expected-problems>
+        <expected-linenumbers>2,3,4</expected-linenumbers>
+        <code><![CDATA[
+BEGIN
+FOR cmp IN (SELECT * FROM companies) LOOP
+  FOR con IN (SELECT * FROM contacts) LOOP
+    FOR pa IN (SELECT * FROM parties) LOOP
+      NULL;
+    END LOOP;
+  END LOOP;
+END LOOP;
+END;
+/
+        ]]></code>
+        <source-type>plsql</source-type>
+    </test-code>
+
+    <test-code>
+        <description>Nested loops - bad example, special pattern</description>
+        <rule-property name="pattern">c_[a-z]+</rule-property>
         <expected-problems>3</expected-problems>
         <expected-linenumbers>2,3,4</expected-linenumbers>
         <code><![CDATA[

From be76e2809f693fce3854a5f8c3c37aaa1f2e7d99 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@microdoc.com>
Date: Fri, 20 Jul 2018 15:11:10 +0200
Subject: [PATCH 08/10] [plsql] Extend CursorForLoopNaming and rename to
 ForLoopNaming It covers now both cursor for loops and index for loops.

---
 .../resources/category/plsql/codestyle.xml    |  19 +-
 .../rule/codestyle/CodeStyleRulesTest.java    |   2 +-
 .../codestyle/xml/CursorForLoopNaming.xml     | 111 ---------
 .../rule/codestyle/xml/ForLoopNaming.xml      | 211 ++++++++++++++++++
 4 files changed, 225 insertions(+), 118 deletions(-)
 delete mode 100644 pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/rule/codestyle/xml/CursorForLoopNaming.xml
 create mode 100644 pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/rule/codestyle/xml/ForLoopNaming.xml

diff --git a/pmd-plsql/src/main/resources/category/plsql/codestyle.xml b/pmd-plsql/src/main/resources/category/plsql/codestyle.xml
index 1d5f51fc9e..e2dfbc8472 100644
--- a/pmd-plsql/src/main/resources/category/plsql/codestyle.xml
+++ b/pmd-plsql/src/main/resources/category/plsql/codestyle.xml
@@ -52,14 +52,14 @@ end inline_pragma_error;
         </example>
     </rule>
 
-    <rule name="CursorForLoopNaming"
+    <rule name="ForLoopNaming"
           language="plsql"
           since="6.6.0"
-          message="Use meaniningful names for loop variables"
+          message="Use meaningful names for loop variables"
           class="net.sourceforge.pmd.lang.rule.XPathRule"
-          externalInfoUrl="${pmd.website.baseurl}/pmd_rules_plsql_codestyle.html#cursorforloopnaming">
+          externalInfoUrl="${pmd.website.baseurl}/pmd_rules_plsql_codestyle.html#forloopnaming">
         <description>
-In case you have nested loops please name the loop variables more meaningful.
+In case you have loops please name the loop variables more meaningful.
         </description>
         <priority>3</priority>
         <properties>
@@ -70,12 +70,19 @@ In case you have nested loops please name the loop variables more meaningful.
     $allowSimpleLoops = 'false' or
     (Statement//CursorForLoopStatement or ancestor::CursorForLoopStatement)
 ]
-/ForIndex[not(matches(@Image, $pattern))]
+/ForIndex[not(matches(@Image, $cursorPattern))]
+|
+//ForStatement[
+    $allowSimpleLoops = 'false' or
+    (Statement//ForStatement or ancestor::ForStatement)
+]
+/ForIndex[not(matches(@Image, $indexPattern))]
 ]]>
                 </value>
             </property>
             <property name="allowSimpleLoops" type="Boolean" description="Ignore simple loops, that are not nested" value="false" />
-            <property name="pattern" type="Regex" description="The pattern used for the loop variable" value="[a-zA-Z_0-9]{5,}" />
+            <property name="cursorPattern" type="Regex" description="The pattern used for the curosr loop variable" value="[a-zA-Z_0-9]{5,}" />
+            <property name="indexPattern" type="Regex" description="The pattern used for the index loop variable" value="[a-zA-Z_0-9]{5,}" />
         </properties>
         <example>
 <![CDATA[
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/CodeStyleRulesTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/CodeStyleRulesTest.java
index 764ae0a7d6..a1cf646748 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/CodeStyleRulesTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/CodeStyleRulesTest.java
@@ -13,6 +13,6 @@ public class CodeStyleRulesTest extends SimpleAggregatorTst {
     @Override
     public void setUp() {
         addRule(RULESET, "MisplacedPragma");
-        addRule(RULESET, "CursorForLoopNaming");
+        addRule(RULESET, "ForLoopNaming");
     }
 }
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/rule/codestyle/xml/CursorForLoopNaming.xml b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/rule/codestyle/xml/CursorForLoopNaming.xml
deleted file mode 100644
index 3fb82f933a..0000000000
--- a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/rule/codestyle/xml/CursorForLoopNaming.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test-data
-    xmlns="http://pmd.sourceforge.net/rule-tests"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://pmd.sourceforge.net/rule-tests http://pmd.sourceforge.net/rule-tests_1_0_0.xsd">
-
-    <test-code>
-        <description>Simple case - no nesting</description>
-        <expected-problems>1</expected-problems>
-        <code><![CDATA[
-BEGIN
-FOR c IN (SELECT * FROM companies) LOOP
-  NULL;
-END LOOP;
-END;
-/
-        ]]></code>
-        <source-type>plsql</source-type>
-    </test-code>
-
-    <test-code>
-        <description>Simple case - no nesting</description>
-        <rule-property name="allowSimpleLoops">true</rule-property>
-        <expected-problems>0</expected-problems>
-        <code><![CDATA[
-BEGIN
-FOR c IN (SELECT * FROM companies) LOOP
-  NULL;
-END LOOP;
-END;
-/
-        ]]></code>
-        <source-type>plsql</source-type>
-    </test-code>
-
-    <test-code>
-        <description>Nested loops - good example, default pattern</description>
-        <expected-problems>0</expected-problems>
-        <code><![CDATA[
-BEGIN
-FOR company IN (SELECT * FROM companies) LOOP
-  FOR contact IN (SELECT * FROM contacts) LOOP
-    FOR party IN (SELECT * FROM parties) LOOP
-      NULL;
-    END LOOP;
-  END LOOP;
-END LOOP;
-END;
-/
-        ]]></code>
-        <source-type>plsql</source-type>
-    </test-code>
-
-    <test-code>
-        <description>Nested loops - good example, special pattern</description>
-        <rule-property name="pattern">c_[a-z]+</rule-property>
-        <expected-problems>0</expected-problems>
-        <code><![CDATA[
-BEGIN
-FOR c_cmp IN (SELECT * FROM companies) LOOP
-  FOR c_con IN (SELECT * FROM contacts) LOOP
-    FOR c_pa IN (SELECT * FROM parties) LOOP
-      NULL;
-    END LOOP;
-  END LOOP;
-END LOOP;
-END;
-/
-        ]]></code>
-        <source-type>plsql</source-type>
-    </test-code>
-
-    <test-code>
-        <description>Nested loops - bad example, default pattern</description>
-        <expected-problems>3</expected-problems>
-        <expected-linenumbers>2,3,4</expected-linenumbers>
-        <code><![CDATA[
-BEGIN
-FOR cmp IN (SELECT * FROM companies) LOOP
-  FOR con IN (SELECT * FROM contacts) LOOP
-    FOR pa IN (SELECT * FROM parties) LOOP
-      NULL;
-    END LOOP;
-  END LOOP;
-END LOOP;
-END;
-/
-        ]]></code>
-        <source-type>plsql</source-type>
-    </test-code>
-
-    <test-code>
-        <description>Nested loops - bad example, special pattern</description>
-        <rule-property name="pattern">c_[a-z]+</rule-property>
-        <expected-problems>3</expected-problems>
-        <expected-linenumbers>2,3,4</expected-linenumbers>
-        <code><![CDATA[
-BEGIN
-FOR c1 IN (SELECT * FROM companies) LOOP
-  FOR c2 IN (SELECT * FROM contacts) LOOP
-    FOR c3 IN (SELECT * FROM parties) LOOP
-      NULL;
-    END LOOP;
-  END LOOP;
-END LOOP;
-END;
-/
-        ]]></code>
-        <source-type>plsql</source-type>
-    </test-code>
-</test-data>
\ No newline at end of file
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/rule/codestyle/xml/ForLoopNaming.xml b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/rule/codestyle/xml/ForLoopNaming.xml
new file mode 100644
index 0000000000..5d6bdf5df1
--- /dev/null
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/rule/codestyle/xml/ForLoopNaming.xml
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<test-data
+    xmlns="http://pmd.sourceforge.net/rule-tests"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://pmd.sourceforge.net/rule-tests http://pmd.sourceforge.net/rule-tests_1_0_0.xsd">
+
+    <test-code>
+        <description>CursorForLoop Simple case - no nesting</description>
+        <expected-problems>1</expected-problems>
+        <code><![CDATA[
+BEGIN
+FOR c IN (SELECT * FROM companies) LOOP
+  NULL;
+END LOOP;
+END;
+/
+        ]]></code>
+        <source-type>plsql</source-type>
+    </test-code>
+
+    <test-code>
+        <description>CursorForLoop Simple case - no nesting - allowSimpleLoops</description>
+        <rule-property name="allowSimpleLoops">true</rule-property>
+        <expected-problems>0</expected-problems>
+        <code><![CDATA[
+BEGIN
+FOR c IN (SELECT * FROM companies) LOOP
+  NULL;
+END LOOP;
+END;
+/
+        ]]></code>
+        <source-type>plsql</source-type>
+    </test-code>
+
+    <test-code>
+        <description>CursorForLoop Nested loops - good example, default pattern</description>
+        <expected-problems>0</expected-problems>
+        <code><![CDATA[
+BEGIN
+FOR company IN (SELECT * FROM companies) LOOP
+  FOR contact IN (SELECT * FROM contacts) LOOP
+    FOR party IN (SELECT * FROM parties) LOOP
+      NULL;
+    END LOOP;
+  END LOOP;
+END LOOP;
+END;
+/
+        ]]></code>
+        <source-type>plsql</source-type>
+    </test-code>
+
+    <test-code>
+        <description>CursorForLoop Nested loops - good example, custom pattern</description>
+        <rule-property name="cursorPattern">c_[a-z]+</rule-property>
+        <expected-problems>0</expected-problems>
+        <code><![CDATA[
+BEGIN
+FOR c_cmp IN (SELECT * FROM companies) LOOP
+  FOR c_con IN (SELECT * FROM contacts) LOOP
+    FOR c_pa IN (SELECT * FROM parties) LOOP
+      NULL;
+    END LOOP;
+  END LOOP;
+END LOOP;
+END;
+/
+        ]]></code>
+        <source-type>plsql</source-type>
+    </test-code>
+
+    <test-code>
+        <description>CursorForLoop Nested loops - bad example, default pattern</description>
+        <expected-problems>3</expected-problems>
+        <expected-linenumbers>2,3,4</expected-linenumbers>
+        <code><![CDATA[
+BEGIN
+FOR cmp IN (SELECT * FROM companies) LOOP
+  FOR con IN (SELECT * FROM contacts) LOOP
+    FOR pa IN (SELECT * FROM parties) LOOP
+      NULL;
+    END LOOP;
+  END LOOP;
+END LOOP;
+END;
+/
+        ]]></code>
+        <source-type>plsql</source-type>
+    </test-code>
+
+    <test-code>
+        <description>CursorForLoop Nested loops - bad example, custom pattern</description>
+        <rule-property name="cursorPattern">c_[a-z]+</rule-property>
+        <expected-problems>3</expected-problems>
+        <expected-linenumbers>2,3,4</expected-linenumbers>
+        <code><![CDATA[
+BEGIN
+FOR c1 IN (SELECT * FROM companies) LOOP
+  FOR c2 IN (SELECT * FROM contacts) LOOP
+    FOR c3 IN (SELECT * FROM parties) LOOP
+      NULL;
+    END LOOP;
+  END LOOP;
+END LOOP;
+END;
+/
+        ]]></code>
+        <source-type>plsql</source-type>
+    </test-code>
+
+    <test-code>
+        <description>ForLoop Simple case - no nesting</description>
+        <expected-problems>1</expected-problems>
+        <expected-linenumbers>2</expected-linenumbers>
+        <code><![CDATA[
+BEGIN
+FOR i IN 1..v_companies.COUNT LOOP
+    NULL;
+END LOOP;
+END;
+/
+        ]]></code>
+    </test-code>
+
+    <test-code>
+        <description>ForLoop Simple case - no nesting - allowSimpleLoops</description>
+        <rule-property name="allowSimpleLoops">true</rule-property>
+        <expected-problems>0</expected-problems>
+        <code><![CDATA[
+BEGIN
+FOR i IN 1..v_companies.COUNT LOOP
+    NULL;
+END LOOP;
+END;
+/
+        ]]></code>
+    </test-code>
+
+    <test-code>
+        <description>ForLoop Nested loops - good example, default pattern</description>
+        <expected-problems>0</expected-problems>
+        <code><![CDATA[
+BEGIN
+FOR company IN 1..v_companies.COUNT LOOP
+    FOR contact IN 1..v_contacts.COUNT LOOP
+        FOR party IN 1..v_parties.COUNT LOOP
+            NULL;
+        END LOOP;
+    END LOOP;
+END LOOP;
+END;
+/
+        ]]></code>
+    </test-code>
+
+    <test-code>
+        <description>ForLoop Nested loops - good example, custom pattern</description>
+        <rule-property name="indexPattern">i_[a-z]+</rule-property>
+        <expected-problems>0</expected-problems>
+        <code><![CDATA[
+BEGIN
+FOR i_cmp IN 1..v_companies.COUNT LOOP
+    FOR i_con IN 1..v_contacts.COUNT LOOP
+        FOR i_pa IN 1..v_parties.COUNT LOOP
+            NULL;
+        END LOOP;
+    END LOOP;
+END LOOP;
+END;
+/
+        ]]></code>
+    </test-code>
+
+    <test-code>
+        <description>ForLoop Nested Loops - bad example, default pattern</description>
+        <expected-problems>3</expected-problems>
+        <expected-linenumbers>2,3,4</expected-linenumbers>
+        <code><![CDATA[
+BEGIN
+FOR i IN 1..v_companies.COUNT LOOP
+    FOR j IN 1..v_contacts.COUNT LOOP
+        FOR k IN 1..v_parties.COUNT LOOP
+            NULL;
+        END LOOP;
+    END LOOP;
+END LOOP;
+END;
+/
+        ]]></code>
+    </test-code>
+
+    <test-code>
+        <description>ForLoop Nested Loops - bad example, custom pattern</description>
+        <rule-property name="indexPattern">i_[a-z]+</rule-property>
+        <expected-problems>3</expected-problems>
+        <expected-linenumbers>2,3,4</expected-linenumbers>
+        <code><![CDATA[
+BEGIN
+FOR i IN 1..v_companies.COUNT LOOP
+    FOR j IN 1..v_contacts.COUNT LOOP
+        FOR k IN 1..v_parties.COUNT LOOP
+            NULL;
+        END LOOP;
+    END LOOP;
+END LOOP;
+END;
+/
+        ]]></code>
+    </test-code>
+</test-data>
\ No newline at end of file

From 43ebc4c3c10105c837eaca9284eadd643964600c Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@microdoc.com>
Date: Fri, 20 Jul 2018 15:28:27 +0200
Subject: [PATCH 09/10] Update release notes - new rule ForLoopNaming
 (plsql-codestyle)

---
 docs/pages/release_notes.md | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md
index 2bee9484cd..70cfffdf61 100644
--- a/docs/pages/release_notes.md
+++ b/docs/pages/release_notes.md
@@ -23,14 +23,18 @@ This is a minor release.
 #### New Rules
 
 *   The new Java rule [`LocalVariableNamingConventions`](pmd_rules_java_codestyle.html#localvariablenamingconventions) (`java-codestlye`)
-    detects local variable names that don't comply to a given convention. It defaults to standrd Java convention of using camelCase,
-    but can be configured. Special cases can be configured for final variables and catched exceptions' names.
+    detects local variable names that don't comply to a given convention. It defaults to standard Java convention of using camelCase,
+    but can be configured. Special cases can be configured for final variables and caught exceptions' names.
 
 *   The new Java rule [`FormalParameterNamingConventions`](pmd_rules_java_codestyle.html#formalparameternamingconventions) (`java-codestlye`)
-    detects formal parameter names that don't comply to a given convention. It defaults to standrd Java convention of using camelCase,
-    but can be configured. Special cases can be configured for final parameters and lambda parameters (considering wether they are
+    detects formal parameter names that don't comply to a given convention. It defaults to standard Java convention of using camelCase,
+    but can be configured. Special cases can be configured for final parameters and lambda parameters (considering whether they are
     explicitly typed or not)
 
+*   The new PL/SQL rule [`ForLoopNaming`](pmd_rules_plsql_codestyle.html#forloopnaming) (`plsql-codestyle`)
+    enforces a naming convention for "for loops". Both "cursor for loops" and "index for loops" are covered.
+    The rule can be customized via patterns. By default, short variable names are reported.
+
 ### Fixed Issues
 
 *   doc

From 369c3fa0a0bd018e90f9fc3711915cdfa7a09df3 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@microdoc.com>
Date: Fri, 20 Jul 2018 15:33:41 +0200
Subject: [PATCH 10/10] Fix rule reference

---
 pmd-core/src/main/resources/rulesets/releases/660.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pmd-core/src/main/resources/rulesets/releases/660.xml b/pmd-core/src/main/resources/rulesets/releases/660.xml
index a2260a4db1..e696ec6de7 100644
--- a/pmd-core/src/main/resources/rulesets/releases/660.xml
+++ b/pmd-core/src/main/resources/rulesets/releases/660.xml
@@ -11,6 +11,6 @@ This ruleset contains links to rules that are new in PMD v6.6.0
     <rule ref="category/java/codestyle.xml/FormalParameterNamingConventions"/>
     <rule ref="category/java/codestyle.xml/LocalVariableNamingConventions"/>
 
-    <rule ref="category/plsql/codestyle.xml/CursorForLoopNaming"/>
+    <rule ref="category/plsql/codestyle.xml/ForLoopNaming"/>
 </ruleset>