Merge branch 'release/1.2.4' into production

docs.json

@@ -1,18 +1,29 @@
 {
     "content": [
-        "README.md",
         {
             "title": "LoopBack DataSource API",
             "depth": 2
         },
         {
-            "title": "Model and types",
+            "title": "Model builder",
             "depth": 3
         },
 
         "lib/model-builder.js",
+        {
+            "title": "Types",
+            "depth": 3
+        },        
         "lib/types.js",
+        {
+            "title": "GeoPoint",
+            "depth": 3
+        },
         "lib/geo.js",
+        {
+            "title": "Model",
+            "depth": 3
+        },        
         "lib/model.js",
 
         {
@@ -35,9 +46,7 @@
             "title": "Base class for SQL connectors",
             "depth": 3
         },
-        "lib/sql.js",
-        "docs/definition-language.md",
-        "docs/datasource-connector.md"
+        "lib/sql.js"
     ],
     "codeSectionDepth": 4,
     "assets": {

lib/datasource.js

@@ -1657,3 +1657,17 @@ function defineReadonlyProp(obj, key, value) {
     });
 }
 
+
+// Carry over a few properties/methods from the ModelBuilder as some tests use them
+DataSource.Text = ModelBuilder.Text;
+DataSource.JSON = ModelBuilder.JSON;
+DataSource.Any = ModelBuilder.Any;
+
+/*!
+ * @deprecated Use ModelBuilder.registerType instead
+ * @param type
+ */
+DataSource.registerType = function(type) {
+  ModelBuilder.registerType(type);
+};
+

package.json

@@ -1,6 +1,6 @@
 {
   "name": "loopback-datasource-juggler",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "description": "LoopBack DataSoure Juggler",
   "keywords": [
     "StrongLoop",