From c334a6fb1eafba7e8dc33393ec66cfaea7d93bf7 Mon Sep 17 00:00:00 2001
From: Andrew Hutchings <andrew@linuxjedi.co.uk>
Date: Mon, 10 Feb 2020 16:24:02 +0000
Subject: [PATCH] Also add support for collate in column definitions

---
 dbcon/ddlpackage/ddl.y | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/dbcon/ddlpackage/ddl.y b/dbcon/ddlpackage/ddl.y
index 6fbbb67f2..d0f408e86 100644
--- a/dbcon/ddlpackage/ddl.y
+++ b/dbcon/ddlpackage/ddl.y
@@ -732,13 +732,25 @@ optional_braces:
 	| '(' ')' {}
 	;
 
+opt_column_charset:
+    /* empty */ {}
+    |
+    IDB_CHAR SET ident {}
+    ;
+
+opt_column_collate:
+    /* empty */ {}
+    |
+    COLLATE ident {}
+    ;
+
 data_type:
-	character_string_type
+	character_string_type opt_column_charset opt_column_collate
 	| binary_string_type
 	| numeric_type
 	| datetime_type
 	| blob_type
-	| text_type
+	| text_type opt_column_charset opt_column_collate
 	| IDB_BLOB
 	{
 		$$ = new ColumnType(DDL_BLOB);