Documentation. Added another unmapped field case.

diff --git a/README.markdown b/README.markdown
index dc8b761dbed13291edec723a83f1971421d2a604..26cc96f7ae6ab4e9deb4282f26006fd30626cf77 100644 (file)
--- a/README.markdown
+++ b/README.markdown
@@ -17,9 +17,9 @@ iciql **is not**...
 \r
 Supported Databases\r
 -------\r
-- [H2 1.3+](http://h2database.com)\r
-- [HSQLDB 2.2+](http://hsqldb.org)\r
-- Support for others is planned and should only require creating a simple "dialect" class.\r
+- [H2 1.3](http://h2database.com)\r
+- [HSQLDB 2.2](http://hsqldb.org)\r
+- Support for others is planned and may only require creating a simple "dialect" class.\r
 \r
 License\r
 -------\r

diff --git a/docs/00_index.mkd b/docs/00_index.mkd
index 1377db1c528773a2e5856f4957e75db897352e18..79139cf3080e97a993d66818a6989323801f6227 100644 (file)
--- a/docs/00_index.mkd
+++ b/docs/00_index.mkd
@@ -36,9 +36,10 @@ select * from products
 </table>\r
 \r
 ### Supported Databases\r
-[H2 1.3+](http://h2database.com), [HSQLDB 2.2+](http://hsqldb.org)\r
+- [H2 1.3](http://h2database.com)\r
+- [HSQLDB 2.2](http://hsqldb.org)\r
 \r
-Support for others is planned and should only require creating a simple "dialect" class.\r
+Support for others is planned and may only require creating a simple "dialect" class.\r
 \r
 ### Java Runtime Requirement\r
 \r

diff --git a/docs/01_model_classes.mkd b/docs/01_model_classes.mkd
index 658ff2b87d645f8abbef0ebb4814410743e33aab..cd52c2bf7643eb085b300ebff62be061272b4f5f 100644 (file)
--- a/docs/01_model_classes.mkd
+++ b/docs/01_model_classes.mkd
@@ -15,7 +15,7 @@ Alternatively, model classes can be automatically generated by iciql using the m
 ### Fully Supported Data Types\r
 The following data types can be used for all iciql expressions.\r
 <table>\r
-<tr><th colspan="2">All Databases</th></tr>\r
+<tr><th colspan="2">Standard SQL Types</th></tr>\r
 <tr><td>java.lang.String</td>\r
 <td>VARCHAR *(length > 0)* or CLOB *(length == 0)*</td></tr>\r
        \r
@@ -64,7 +64,7 @@ The following data types can be used for all iciql expressions.
 <tr><td>java.lang.Enum implements<br/>*com.iciql.Iciql.EnumId.enumId()*</td>\r
 <td>INT<br/>*EnumType.ENUMID*</td></tr>\r
 \r
-<tr><th colspan="2">H2 Databases</th></tr>\r
+<tr><th colspan="2">H2 Database Types</th></tr>\r
 <tr><td>java.util.UUID</td>\r
 <td>UUID</td><tr/>\r
 \r
@@ -75,7 +75,7 @@ The reverse lookup used for model generation, SQL type -> Java type, contains mo
 Please consult the `com.iciql.ModelUtils` class for details. \r
 \r
 ### Partially Supported Data Types\r
-The following data types can be mapped to columns for all general statements <u>BUT</u> these field types may **not** be used to specify **compile-time** *clauses or constraints*.\r
+The following data types can be mapped to columns for all general statements <u>BUT</u> these field types may **not** be used to specify **compile-time** clauses or constraints.\r
 \r
 <table>\r
 <tr><td>byte []</td>\r

diff --git a/docs/05_building.mkd b/docs/05_building.mkd
index cb8381e7c01b87994f79d7896400b1290f299ef2..6e6196a1695dfb8c4c18901d173061dc997244c2 100644 (file)
--- a/docs/05_building.mkd
+++ b/docs/05_building.mkd
@@ -9,6 +9,7 @@ Additionally, [eclipse-cs](http://eclipse-cs.sourceforge.net), [FindBugs](http:/
 \r
 ### Build Dependencies (downloaded during build)\r
 - [H2 Database](http://h2database.com) (Eclipse Public License 1.0)\r
+- [HSQL Database Engine](http://hsqldb.org) (BSD)\r
 - [JUnit](http://junit.org) (Common Public License)\r
 - [commons-net](http://commons.apache.org/net) (Apache 2.0)\r
 - [ant-googlecode](http://code.google.com/p/ant-googlecode) (New BSD)\r

diff --git a/docs/05_releases.mkd b/docs/05_releases.mkd
index c9990625067773b0fd61777f477fffc98c36c95e..a0905e54affc33829e9db0112c73d6179344aa8b 100644 (file)
--- a/docs/05_releases.mkd
+++ b/docs/05_releases.mkd
@@ -15,8 +15,8 @@
 - moved dialects back to main package\r
 - improved automatic dialect determination on pooled connections\r
 - moved create table and create index statement generation into dialects\r
-- added HSQL dialect.  HSQL fails 4 unit tests, 2 of which are unimplemented merge, 1 has been filed as a bug in HSQL.\r
-- added MySQL dialect.  Untested.\r
+- added HSQL dialect.  HSQL fails 4 out of 49 unit tests: 2 failures are unimplemented merge, 1 has been filed as a bug in HSQL.\r
+- added MySQL dialect.  untested.\r
 - renamed <b>_ iq_versions</b> table to *iq_versions* since leading _ character is troublesome for some databases.\r
 - @IQColumn(allowNull=true) -> @IQColumn(nullable=true)\r
 - All columns are assumed NULLABLE unless explicitly set *@IQColumn(nullable = false)*\r

diff --git a/src/com/iciql/IciqlException.java b/src/com/iciql/IciqlException.java
index 6e55c7906b8046aa76fc599adcb7b4f3f66ee5f2..5a99c5e96d4b8652ee408ccc0a4f10b8a195d345 100644 (file)
--- a/src/com/iciql/IciqlException.java
+++ b/src/com/iciql/IciqlException.java
@@ -30,7 +30,7 @@ public class IciqlException extends RuntimeException {
        public static final int CODE_TABLE_NOT_FOUND = 3;\r
        public static final int CODE_INDEX_ALREADY_EXISTS = 4;\r
 \r
-       private static final String TOKEN_UNMAPPED_FIELD = "\\? (=|\\>|\\<|!=|\\>=|\\<=|LIKE|BETWEEN) \\?";     \r
+       private static final String TOKEN_UNMAPPED_FIELD = "\\? (=|\\>|\\<|\\<\\>|!=|\\>=|\\<=|LIKE|BETWEEN) \\?";      \r
 \r
        private static final long serialVersionUID = 1L;\r
 \r

diff --git a/src/com/iciql/SQLDialectDefault.java b/src/com/iciql/SQLDialectDefault.java
index 3fd206767f69234f01bb580f1314eedd862ade0a..7786829f71be4034d2e0a5db6a50637e75d247e2 100644 (file)
--- a/src/com/iciql/SQLDialectDefault.java
+++ b/src/com/iciql/SQLDialectDefault.java
@@ -100,7 +100,7 @@ public class SQLDialectDefault implements SQLDialect {
                        buff.appendExceptFirst(", ");\r
                        buff.append(prepareColumnName(field.columnName)).append(' ');\r
                        String dataType = field.dataType;\r
-                       if (dataType.equals("VARCHAR")) {               \r
+                       if (dataType.equals("VARCHAR")) {\r
                                // check to see if we should use VARCHAR or CLOB\r
                                if (field.length <= 0) {\r
                                        dataType = "CLOB";\r
@@ -111,7 +111,7 @@ public class SQLDialectDefault implements SQLDialect {
                                }\r
                        } else if (dataType.equals("DECIMAL")) {\r
                                // DECIMAL(precision,scale)\r
-                               buff.append(convertSqlType(dataType));                          \r
+                               buff.append(convertSqlType(dataType));\r
                                if (field.length > 0) {\r
                                        buff.append('(').append(field.length);\r
                                        if (field.scale > 0) {\r
@@ -173,13 +173,13 @@ public class SQLDialectDefault implements SQLDialect {
        @Override\r
        public void prepareCreateIndex(SQLStatement stat, String schemaName, String tableName,\r
                        IndexDefinition index) {\r
-               throw new IciqlException("Dialect does not support index creation!");\r
+               throw new IciqlException("{0} does not support index creation!", getClass().getSimpleName());\r
        }\r
 \r
        @Override\r
        public <T> void prepareMerge(SQLStatement stat, String schemaName, String tableName,\r
                        TableDefinition<T> def, Object obj) {\r
-               throw new IciqlException("Dialect does not support merge statements!");\r
+               throw new IciqlException("{0} does not support merge statements!", getClass().getSimpleName());\r
        }\r
 \r
        @Override\r