Browse Source
remove extra object flags before checking query type
git-svn-id: https://svn.code.sf.net/p/jackcess/code/jackcess/branches/jackcess-1.2.14@764 f203690c-595d-4dc9-a70b-905162fa7fd2tags/jackcess-1.2.14.1
James Ahlborn
10 years ago
3 changed files with 13 additions and 2 deletions
+ 6
- 0
src/changes/changes.xml
View File
| @@ -4,6 +4,12 @@ | |||
| <author email="javajedi@users.sf.net">Tim McCune</author> | |||
| </properties> | |||
| <body> | |||
| <release version="1.2.14.1" date="TBD"> | |||
| <action dev="jahlborn" type="fix" system="SourceForge2Features" | |||
| issue="25"> | |||
| Remove extra object flags before checking query type. | |||
| </action> | |||
| </release> | |||
| <release version="1.2.14" date="2013-07-23"> | |||
| <action dev="jahlborn" type="fix" system="SourceForge2" issue="95"> | |||
| Implement handling of usagemaps for long value (MEMO/OLE) columns. | |||
+ 4
- 2
src/java/com/healthmarketscience/jackcess/query/Query.java
View File
| @@ -413,8 +413,10 @@ public abstract class Query | |||
| public static Query create(int objectFlag, String name, List<Row> rows, | |||
| int objectId) | |||
| { | |||
| // remove other object flags before testing for query type | |||
| int typeFlag = objectFlag & OBJECT_FLAG_MASK; | |||
| try { | |||
| switch(objectFlag) { | |||
| switch(typeFlag) { | |||
| case SELECT_QUERY_OBJECT_FLAG: | |||
| return new SelectQuery(name, rows, objectId); | |||
| case MAKE_TABLE_QUERY_OBJECT_FLAG: | |||
| @@ -436,7 +438,7 @@ public abstract class Query | |||
| default: | |||
| // unknown querytype | |||
| throw new IllegalStateException( | |||
| "unknown query object flag " + objectFlag); | |||
| "unknown query object flag " + typeFlag); | |||
| } | |||
| } catch(IllegalStateException e) { | |||
| LOG.warn("Failed parsing query", e); | |||
+ 3
- 0
src/java/com/healthmarketscience/jackcess/query/QueryFormat.java
View File
| @@ -58,6 +58,9 @@ public class QueryFormat | |||
| // dbQProcedure = 224 | |||
| // dbQAction = 240 | |||
| // mask which removes superfluous flags from object flags | |||
| static final int OBJECT_FLAG_MASK = 0XF0; | |||
| public static final String COL_ATTRIBUTE = "Attribute"; | |||
| public static final String COL_EXPRESSION = "Expression"; | |||
| public static final String COL_FLAG = "Flag"; | |||
Loading…