Merge 31d5a3c into 432a32f

querydsl · Aug 13, 2017 · 63c9ab0 · 63c9ab0
2 parents 432a32f + 31d5a3c
commit 63c9ab0
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLServerTemplates.java b/querydsl-sql/src/main/java/com/mysema/query/sql/SQLServerTemplates.java
@@ -14,7 +14,9 @@
 package com.mysema.query.sql;
 
 import java.sql.Types;
+import java.util.Set;
 
+import com.google.common.collect.ImmutableSet;
 import com.mysema.query.QueryFlag;
 import com.mysema.query.QueryFlag.Position;
 import com.mysema.query.QueryMetadata;
@@ -42,6 +44,15 @@ protected SQLTemplates build(char escape, boolean quote) {
         };
     }
 
+    private static final Set<String> MSSQL_SPECIFIC_KEYWORDS
+            = ImmutableSet.of("KEY");
+
+    private static final Set<String> MSSQL_RESERVED_WORDS
+            = ImmutableSet.<String>builder()
+                          .addAll(SQL_RESERVED_WORDS)
+                          .addAll(MSSQL_SPECIFIC_KEYWORDS)
+                          .build();
+
     private String topTemplate = "top {0s} ";
 
     public SQLServerTemplates() {
@@ -53,7 +64,7 @@ public SQLServerTemplates(boolean quote) {
     }
 
     public SQLServerTemplates(char escape, boolean quote) {
-        super("\"", escape, quote);
+        super(MSSQL_RESERVED_WORDS, "\"", escape, quote);
         setDummyTable("");
         setNullsFirst(null);
         setNullsLast(null);