Fixed a bug that was causing collation assigned to column not to be

reflected in SQL and XML codes (isse ##2028)

Fixed a bug that was causing collations to be saved always as
deterministic even the user unchecked the option in editing form (issue
#2029)

Author: rkhaotix

assets/schemas/sql/column.sch

@@ -16,6 +16,10 @@
 
 {name} $sp {type}
 
+%if {collation} %then
+	[ COLLATE ]  {collation}
+%end
+
 %if {not-null} %then
 	[ NOT NULL]
 %end

assets/schemas/xml/collation.sch

@@ -16,7 +16,9 @@
 	%if {lc-ctype} %then [ lc-ctype=] "{lc-ctype}" %end
 	%if {lc-ctype-mod} %then [ lc-ctype-mod=] "{lc-ctype-mod}" %end
 	%if {provider} %then [ provider=] "{provider}" %end
-	%if {deterministic} %then [ deterministic=] "true" %end
+
+	[ deterministic=] "{deterministic}"
+
 	%if {sql-disabled} %then [ sql-disabled=] "true" %end
 
 	> $br

assets/schemas/xml/column.sch

@@ -47,6 +47,8 @@ $tb [<column name=] "&{name}"
 
 $tb {type}
 
+%if {collation} %then $tb {collation} %end
+
 %if {comment} %then $tb {comment} %end
 
 $tb </column> $br