Fix: fix parseGroup error when has expression

arterli · Mar 14, 2016 · 8d5ad98 · 8d5ad98
1 parent c1e45fa
commit 8d5ad98
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/src/adapter/db/_parse.js b/src/adapter/db/_parse.js
@@ -512,6 +512,10 @@ export default class extends think.base {
       return '';
     }
     if (think.isString(group)) {
+      //group may be `date_format(create_time,'%Y-%m-%d')`
+      if(group.indexOf('(') !== -1){
+        return ' GROUP BY ' + group;
+      }
       group = group.split(/\s*,\s*/);
     }
     let result = group.map(item => {

diff --git a/src/util/checker.js b/src/util/checker.js
@@ -66,7 +66,7 @@ export default {
     //package alias
     let pkgAlias = {
       'babel-runtime': 'babel-runtime/helpers/inherits'
-    }
+    };
     let pkgPath = `${think.ROOT_PATH}${think.sep}node_modules${think.sep}`;
     for(let pkg in dependencies){
       pkg = pkgAlias[pkg] || pkg;

diff --git a/test/adapter/db/_parse.js b/test/adapter/db/_parse.js
@@ -225,6 +225,11 @@ describe('adapter/db/_parse.js', function(){
     var data = instance.parseGroup('name');
     assert.equal(data, ' GROUP BY `name`');
   })
+  it('parseGroup, name', function(){
+    var instance = new Parse();
+    var data = instance.parseGroup("date_format(create_time,'%Y-%m-%d')");
+    assert.equal(data, " GROUP BY date_format(create_time,'%Y-%m-%d')");
+  })
   it('parseGroup, name,title', function(){
     var instance = new Parse();
     var data = instance.parseGroup('name, title');