diff options
| author | James Ahlborn <jtahlborn@yahoo.com> | 2018-06-05 03:56:12 +0000 |
|---|---|---|
| committer | James Ahlborn <jtahlborn@yahoo.com> | 2018-06-05 03:56:12 +0000 |
| commit | eae1835fb7478fed6d93785d9154e72008fabd5e (patch) | |
| tree | 14c6f964d8886caf11cd781b2d261b49ec561257 /src/main/java/com | |
| parent | c8f31f36dd277fb819e5aa632459170de2162f41 (diff) | |
| download | jackcess-eae1835fb7478fed6d93785d9154e72008fabd5e.tar.gz jackcess-eae1835fb7478fed6d93785d9154e72008fabd5e.zip | |
add unit tests for property expression evaluation features
git-svn-id: https://svn.code.sf.net/p/jackcess/code/jackcess/branches/exprs@1162 f203690c-595d-4dc9-a70b-905162fa7fd2
Diffstat (limited to 'src/main/java/com')
| -rw-r--r-- | src/main/java/com/healthmarketscience/jackcess/impl/ColValidatorEvalContext.java | 2 | ||||
| -rw-r--r-- | src/main/java/com/healthmarketscience/jackcess/impl/ColumnImpl.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/com/healthmarketscience/jackcess/impl/ColValidatorEvalContext.java b/src/main/java/com/healthmarketscience/jackcess/impl/ColValidatorEvalContext.java index f55aa17..521fe4d 100644 --- a/src/main/java/com/healthmarketscience/jackcess/impl/ColValidatorEvalContext.java +++ b/src/main/java/com/healthmarketscience/jackcess/impl/ColValidatorEvalContext.java @@ -87,7 +87,7 @@ public class ColValidatorEvalContext extends ColEvalContext "Invalid column value '" + val + "'"); throw new InvalidValueException(withErrorContext(msg)); } - return result; + return val; } finally { reset(); } diff --git a/src/main/java/com/healthmarketscience/jackcess/impl/ColumnImpl.java b/src/main/java/com/healthmarketscience/jackcess/impl/ColumnImpl.java index f195b12..be2bf1c 100644 --- a/src/main/java/com/healthmarketscience/jackcess/impl/ColumnImpl.java +++ b/src/main/java/com/healthmarketscience/jackcess/impl/ColumnImpl.java @@ -2017,7 +2017,7 @@ public class ColumnImpl implements Column, Comparable<ColumnImpl> { boolean isThisColumn(Identifier identifier) { return(getTable().isThisTable(identifier) && - identifier.getObjectName().equalsIgnoreCase(getName())); + getName().equalsIgnoreCase(identifier.getObjectName())); } private static String withErrorContext( |