for #567

apache · Jan 17, 2018 · 06c1979 · 06c1979
1 parent f5882ef
commit 06c1979
Showing 1 changed file with 17 additions and 9 deletions.
diff --git a/sharding-jdbc-core/src/main/java/io/shardingjdbc/core/util/SQLUtil.java b/sharding-jdbc-core/src/main/java/io/shardingjdbc/core/util/SQLUtil.java
@@ -52,15 +52,23 @@ public static String getExactlyValue(final String value) {
      * @return original SQL expression
      */
     public static String getOriginalValue(final String value, final DatabaseType databaseType) {
-        if (DatabaseType.MySQL == databaseType) {
-            try {
-                DefaultKeyword.valueOf(value.toUpperCase());
-                MySQLKeyword.valueOf(value.toUpperCase());
-                return String.format("`%s`", value);
-            } catch (final IllegalArgumentException ex) {
-                return value;
-            }
+        if (DatabaseType.MySQL != databaseType) {
+            return value;
+        }
+        try {
+            DefaultKeyword.valueOf(value.toUpperCase());
+            return String.format("`%s`", value);
+        } catch (final IllegalArgumentException ex) {
+            return getOriginalValueForMySQLKeyword(value);
+        }
+    }
+
+    private static String getOriginalValueForMySQLKeyword(final String value) {
+        try {
+            MySQLKeyword.valueOf(value.toUpperCase());
+            return String.format("`%s`", value);
+        } catch (final IllegalArgumentException ex) {
+            return value;
         }
-        return value;
     }
 }