# This patch file was generated by NetBeans IDE # Following Index: paths are relative to: /home/matthias/NetBeansProjects/core-main # This patch can be applied using context Tools: Patch action on respective folder. # It uses platform neutral UTF-8 encoding and \n newlines. # Above lines and this line are ignored by the patching process. Index: db.sql.editor/src/org/netbeans/modules/db/sql/editor/completion/SQLCompletionQuery.java --- db.sql.editor/src/org/netbeans/modules/db/sql/editor/completion/SQLCompletionQuery.java Base (BASE) +++ db.sql.editor/src/org/netbeans/modules/db/sql/editor/completion/SQLCompletionQuery.java Locally Modified (Based On LOCAL) @@ -441,7 +441,7 @@ private void completeTuple(Identifier ident) { if (ident.fullyTypedIdent.isEmpty()) { completeTupleSimpleIdent(ident.lastPrefix, ident.quoted); - } else if (ident.fullyTypedIdent.isSimple()) { + } else { completeTupleQualIdent(ident.fullyTypedIdent, ident.lastPrefix, ident.quoted); } } Index: db.sql.editor/test/unit/src/org/netbeans/modules/db/sql/editor/completion/SelectCompletionQueryTest.java --- db.sql.editor/test/unit/src/org/netbeans/modules/db/sql/editor/completion/SelectCompletionQueryTest.java Base (BASE) +++ db.sql.editor/test/unit/src/org/netbeans/modules/db/sql/editor/completion/SelectCompletionQueryTest.java Locally Modified (Based On LOCAL) @@ -137,6 +137,10 @@ suite.addTest(new SelectCompletionQueryTest("selectAfterDeclare")); suite.addTest(new SelectCompletionQueryTest("selectAfterSet")); + // #200368: CC does not work with fully qualified names (catalog, schema) + // table names are not completed + suite.addTest(new SelectCompletionQueryTest("selectQualifiedIdentifierFrom")); + return suite; } Index: db.sql.editor/test/unit/src/org/netbeans/modules/db/sql/editor/completion/selectQualifiedIdentifierFrom.pass --- db.sql.editor/test/unit/src/org/netbeans/modules/db/sql/editor/completion/selectQualifiedIdentifierFrom.pass Base (selectTripleQualColumn.pass) +++ db.sql.editor/test/unit/src/org/netbeans/modules/db/sql/editor/completion/selectQualifiedIdentifierFrom.pass Locally Copied @@ -1,2 +1,2 @@ -Column invoice_id in table acatalog.accounting.invoice -Column customer_id in table acatalog.accounting.invoice +Table customer +Table invoice \ No newline at end of file Index: db.sql.editor/test/unit/src/org/netbeans/modules/db/sql/editor/completion/selectQualifiedIdentifierFrom.test --- db.sql.editor/test/unit/src/org/netbeans/modules/db/sql/editor/completion/selectQualifiedIdentifierFrom.test Base (selectTripleQualColumn.test) +++ db.sql.editor/test/unit/src/org/netbeans/modules/db/sql/editor/completion/selectQualifiedIdentifierFrom.test Locally Copied @@ -1,4 +1,4 @@ -select acatalog.accounting.invoice.| +select * from acatalog.accounting.| --