Builder/Provider/Database/generate.js

[app.Builder.js] / Builder / Provider / Database / generate.js

diff --git a/Builder/Provider/Database/generate.js b/Builder/Provider/Database/generate.js
index 523959b..9b96d42 100644 (file)
--- a/Builder/Provider/Database/generate.js
+++ b/Builder/Provider/Database/generate.js
@@ -75,7 +75,7 @@ Gda.DataSelect.prototype.fetchAll = function()
         cols.forEach(function(n,i) {
             var val = _this.get_value_at(i,r);
             var type = GObject.type_name(val.g_type) ;
-            var vs = type == 'GdaBinary' ? val.value.to_string(1024) : val.value;
+            var vs = ['GdaBinary', 'GdaBlob' ].indexOf(type) > -1 ? val.value.to_string(1024) : val.value;
             //print(n + " : TYPE: " + GObject.type_name(val.g_type) + " : " + vs);
             //print (n + '=' + iter.get_value_at(i).value);
             add[n] = vs;
@@ -100,9 +100,11 @@ var map = {
     'varchar' : 'string',
     'text' : 'string',
     'longtext' : 'string',
+    'tinytext' : 'string',
     'mediumtext' : 'string',
     'enum' : 'string',
-    
+    'timestamp' : 'number',
+    'blob' : 'text'
     
 }
 
@@ -149,15 +151,11 @@ if (File.isDirectory(cfg.INI)) {
         }
     );
     
-    print(JSON.stringify(dirs, null,4));
-    Seed.quit();
+     
     dirs.forEach(function(d) {
         // this currently misses the web.*/Pman/XXXX/DataObjects..
-        var path = GLib.get_home_dir() + '/gitlive/' + d + '/DataObjects';
-        if (!File.isDirectory(path)) {
-            path = GLib.get_home_dir() + '/gitlive/' + d + '/Pman/DataObjects';
-        }
-        
+        var path = cfg.INI + '/Pman/' + d + '/DataObjects';
+         
         if (!File.isDirectory(path)) {
             return; //skip
         }
@@ -211,7 +209,7 @@ tables.forEach(function(table) {
        
     var firstTxtCol = '';
     
-    //print(JSON.stringify(schema, null,4));
+    print(JSON.stringify(schema, null,4));
     
     schema.forEach(function(e)  {
         var type = e.Type.match(/([^(]+)\(([^\)]+)\)/);
@@ -390,8 +388,12 @@ readers.forEach(function(reader) {
     // we have a map..
     for (var col in ini[reader.table]) {
         var kv = ini[reader.table][col].split(':');
-        var add = readers.filter(function(r) { return r.table == kv[0] })[0];
         
+        
+        var add = readers.filter(function(r) { return r.table == kv[0] })[0];
+        if (!add) {
+            continue;
+        }
         // merge in data (eg. project_id => project_id_*****
      
         add.oreader.forEach(function(or) {
@@ -552,7 +554,7 @@ readers.forEach(function(reader) {
                                             "   //}); \n"+
                                             "}\n"
                                     },
-                                    "|xns": "Roo"
+                                    "|xns": "Roo.Toolbar"
                                 },
                                 {
                                     "text": "Edit",
@@ -575,7 +577,7 @@ readers.forEach(function(reader) {
                                             "}\n" 
                                         
                                     },
-                                    "|xns": "Roo"
+                                    "|xns": "Roo.Toolbar"
                                 },
                                 {
                                     "text": "Delete",
@@ -589,7 +591,7 @@ readers.forEach(function(reader) {
                                             "}\n"+
                                             "        "
                                     },
-                                    "|xns": "Roo"
+                                    "|xns": "Roo.Toolbar"
                                 }
                             ]
                         }, // end toolbar