diff --git a/lib/ace/mode/sql_highlight_rules.js b/lib/ace/mode/sql_highlight_rules.js
index f9ff39d9..31e8846b 100644
--- a/lib/ace/mode/sql_highlight_rules.js
+++ b/lib/ace/mode/sql_highlight_rules.js
@@ -38,7 +38,8 @@ var SqlHighlightRules = function() {
 
     var keywords = (
         "select|insert|update|delete|from|where|and|or|group|by|order|limit|offset|having|as|case|" +
-        "when|else|end|type|left|right|join|on|outer|desc|asc|union"
+        "when|else|end|type|left|right|join|on|outer|desc|asc|union|create|table|primary key|if|not|" +
+        "foreign key|"
     );
 
     var builtinConstants = (
@@ -46,7 +47,8 @@ var SqlHighlightRules = function() {
     );
 
     var builtinFunctions = (
-        "count|min|max|avg|sum|rank|now|coalesce"
+        "count|min|max|avg|sum|rank|now|coalesce|int|numeric|decimal|date|boolean|varchar|char|bigint|" +
+        "float|double"
     );
 
     var keywordMapper = this.createKeywordMapper({