Fixed order of DEFAULT in create table statement (issue 11)

diff --git a/docs/05_releases.mkd b/docs/05_releases.mkd
index fcaea77a1934061d4e2056a4c5dfe768773a0834..8ce8e1289f8ea991fb8a8252e9aa1710ff31905e 100644 (file)
--- a/docs/05_releases.mkd
+++ b/docs/05_releases.mkd
@@ -4,6 +4,7 @@
 \r
 **%VERSION%** ([zip](http://code.google.com/p/iciql/downloads/detail?name=%ZIP%)|[jar](http://code.google.com/p/iciql/downloads/detail?name=%JAR%))   *released %BUILDDATE%*\r
 \r
+- Fixed order of DEFAULT value in create table statement (issue 11)\r
 - Fixed password bug in model generator (issue 7)\r
 \r
 **1.1.0**   *released 2012-08-20*\r

diff --git a/src/com/iciql/SQLDialectDefault.java b/src/com/iciql/SQLDialectDefault.java
index 617bffb4235726b645acd79823c047d7d9cec207..7cc6bd7552124a0eedf0e46db5d1933948f3ca7a 100644 (file)
--- a/src/com/iciql/SQLDialectDefault.java
+++ b/src/com/iciql/SQLDialectDefault.java
@@ -134,10 +134,6 @@ public class SQLDialectDefault implements SQLDialect {
                                                field.isAutoIncrement, field.isPrimaryKey);\r
                        }\r
 \r
-                       if (!field.nullable) {\r
-                               buff.append(" NOT NULL");\r
-                       }\r
-\r
                        // default values\r
                        if (!field.isAutoIncrement && !field.isPrimaryKey) {\r
                                String dv = field.defaultValue;\r
@@ -148,6 +144,10 @@ public class SQLDialectDefault implements SQLDialect {
                                        }\r
                                }\r
                        }\r
+\r
+                       if (!field.nullable) {\r
+                               buff.append(" NOT NULL");\r
+                       }\r
                }\r
 \r
                // if table does not have identity column then specify primary key\r