#756 extend dimension/metric with configuration's

lib/dispatch/query.js

@@ -133,12 +133,6 @@ manager.parseDimension = function(context, d, callback) {
       key: d
     };
   }
-  //if this is a computed dimension, simply pass it on
-  if (!d.dependsOn)
-    d.dependsOn = d.key;
-  if (!d.name)
-    d.name = d.key;
-
   d.collection = d.collection || context.query.collection;
   //let's find the metric
   if (d.collection) {
@@ -147,6 +141,11 @@ manager.parseDimension = function(context, d, callback) {
       if (err)
         return callback(err);
 
+      d = ce.extend(collection[d.key], d);
+      if (!d.dependsOn)
+        d.dependsOn = d.key;
+      if (!d.name)
+        d.name = d.key;
       col = collection[d.dependsOn] ? collection : null;
 
       if (!col && d.dependsOn.indexOf('.') > -1) {
@@ -215,8 +214,6 @@ manager.parseMetric = function(context, m, callback) {
   m.collection = m.collection || context.query.collection;
   if (!m.key && m.dependsOn)
     m.key = m.dependsOn;
-  if (!m.dependsOn)
-    m.dependsOn = m.key;
   //if (!m.name)
   //  m.name = m.key;
 
@@ -228,7 +225,11 @@ manager.parseMetric = function(context, m, callback) {
         return callback(err);
 
       col = collection[m.dependsOn] ? collection : null;
-
+      m = ce.extend(collection[m.key], m);
+      if (!d.dependsOn)
+        m.dependsOn = m.key;
+      if (!m.name)
+        m.name = m.key;
       if (!col && m.dependsOn.indexOf('.') > -1) {
         //let's see if we're dealing with a compound key
         if (joola.common.checkNested(collection, m.dependsOn)) {