UPDATE OR INSERT with existing RETURNING clause handled incorrectly for generated keys [JDBC566]

[firebird-issue-importer]

Submitted by: @mrotteveel

The grammar for UPDATE OR INSERT has a minor bug (expecting MATCHING columnlist instead of MATCHING (columnlist)), which causes an existing RETURNING clause to not be properly identified. This results in Jaybird adding yet another RETURNING clause.

Simple reproduction:

public static void main\(String\[\] args\) throws SQLException \{
    try \(Connection connection = DefaultDb\.createDefaultConnection\(\);
         Statement stmt = connection\.createStatement\(\)\) \{
        stmt\.execute\("update or insert into person \(id, name\) values \(3, 'henk'\) "
                \+ "matching \(id\) "
                \+ "returning id", Statement\.RETURN\_GENERATED\_KEYS\);

        try \(ResultSet keys = stmt\.getGeneratedKeys\(\)\) \{
            while \(keys\.next\(\)\) \{
                System\.out\.println\(keys\.getInt\(1\)\);
            \}
        \}
    \}
\}

This results in error:
java.sql.SQLSyntaxErrorException: Dynamic SQL Error; SQL error code = -104; Token unknown - line 2, column 11; "ID" [SQLState:42000, ISC error code:335544634]

This bug in the grammar is also present in Jaybird 2.2, but difference between ANTLR 3.4 and 4.7 apparently cause ANTLR 3.4 to still correctly identify the RETURNING clause.

See also: https://groups.yahoo.com/neo/groups/Firebird-Java/conversations/messages/11490

Commits: 9de9584 e1f7413

[firebird-issue-importer]

Commented by: @mrotteveel

Consider whether to fix the grammar in Jaybird 2.2 as well.

[firebird-issue-importer]

Modified by: @mrotteveel

Fix Version: Jaybird 3.0.6 [ 10883 ]

Fix Version: Jaybird 4 [ 10441 ]

[firebird-issue-importer]

Commented by: @mrotteveel

Fix committed for Jaybird 3.0.6 and Jaybird 4

[firebird-issue-importer]

Modified by: @mrotteveel

status: Open [ 1 ] => Resolved [ 5 ]

resolution: Fixed [ 1 ]

[firebird-issue-importer]

Modified by: @mrotteveel

status: Resolved [ 5 ] => Closed [ 6 ]