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 322e3be..44e14d7 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'
     
 }
 
@@ -323,6 +325,8 @@ tables.forEach(function(table) {
                 '*prop' : 'store',
                 'xtype' : 'Store',
                 '|xns' : 'Roo.data',
+                'remoteSort' : true,
+                '|sortInfo' : '{ direction : \'ASC\', field: \'id\' }',
                 listeners : {
                     '|beforeload' : 'function (_self, o)' +
                     "{\n" +
@@ -386,8 +390,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) {
@@ -548,7 +556,7 @@ readers.forEach(function(reader) {
                                             "   //}); \n"+
                                             "}\n"
                                     },
-                                    "|xns": "Roo"
+                                    "|xns": "Roo.Toolbar"
                                 },
                                 {
                                     "text": "Edit",
@@ -571,7 +579,7 @@ readers.forEach(function(reader) {
                                             "}\n" 
                                         
                                     },
-                                    "|xns": "Roo"
+                                    "|xns": "Roo.Toolbar"
                                 },
                                 {
                                     "text": "Delete",
@@ -585,7 +593,7 @@ readers.forEach(function(reader) {
                                             "}\n"+
                                             "        "
                                     },
-                                    "|xns": "Roo"
+                                    "|xns": "Roo.Toolbar"
                                 }
                             ]
                         }, // end toolbar