Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.basex.query.expr.path;

import org.basex.index.name.*;
import org.basex.data.*;
import org.basex.query.*;
import org.basex.query.value.item.*;
Expand Down Expand Up @@ -103,9 +104,9 @@ public Test optimize(final Kind kn, final Data data) {
}

// check if local element/attribute names occur in database
if(!kind.oneOf(Kind.GNODE, Kind.PROCESSING_INSTRUCTION) && name != null &&
!(kind == Kind.ELEMENT ? data.elemNames : data.attrNames).contains(name)) {
return null;
if(!kind.oneOf(Kind.GNODE, Kind.PROCESSING_INSTRUCTION) && name != null) {
final Names names = kind == Kind.ELEMENT ? data.elemNames : data.attrNames;
if(!names.contains(name) && !names.contains(Token.concat(Token.XML, ':', name))) return null;
}
return this;
}
Expand Down
9 changes: 9 additions & 0 deletions basex-core/src/test/java/org/basex/query/NamespaceTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -896,6 +896,15 @@ public void copyPreserveNoInheritPersistent() {
query("db:get('db')/*:B", "<b:B xmlns:b=\"b\"/>");
}

/** Wildcard name test with xml namespace on database content (GH-2642). */
@Test public void gh2642() {
final String doc = "<x xml:a=''><xml:a/></x>";
execute(new CreateDB("db", doc));
query("/x[@xml:a]", doc);
query("/x[@*:a]", doc);
query("/x[*:a]", doc);
}

/** Tests fixed default element namespaces. */
@Test public void fixed() {
// non-fixed: constructor xmlns="" changes the default namespace seen by enclosed expressions
Expand Down
Loading