dbgenerate.js

[app.Builder.js] / dbgenerate.js

diff --git a/dbgenerate.js b/dbgenerate.js
index 6f09652..53a7cb8 100644 (file)
--- a/dbgenerate.js
+++ b/dbgenerate.js
@@ -25,7 +25,7 @@ console = imports.console;
 File = imports.File.File;
 Options = imports.Options.Options;
 
-Gda.init();
+//Gda.init();
 
 var prov = Gda.Config.list_providers ();
 //print(prov.dump_as_string());
@@ -96,10 +96,11 @@ Gda.DataSelect.prototype.fetchAll = function()
 
 var map = {
     'date' : 'date',
-    'datetime' : 'string',
+    'datetime' : 'date',
+    'time' : 'string', //bogus
     'int' : 'int',
     'bigint' : 'int',
-    
+    'double' : 'float',
     'tinyint' : 'int',
     'decimal' : 'float',
     'float' : 'float',
@@ -120,7 +121,8 @@ var ini = { }
 function readIni(fn)
 {
     print('Read INI : ' + fn);
-    var key_file = new GLib.KeyFile.c_new();
+    //var key_file = new GLib.KeyFile.c_new();
+    var key_file = new GLib.KeyFile();
     if (!key_file.load_from_file (fn , GLib.KeyFileFlags.NONE )) {
         return;
     }
@@ -458,6 +460,7 @@ readers.forEach(function(reader) {
 
     var dir = GLib.get_home_dir() + '/.Builder/Roo.data.JsonReader'; 
     if (!File.isDirectory(dir)) {
+        print("mkdir " + dir);
         File.mkdir(dir);
     }
     
@@ -485,6 +488,7 @@ readers.forEach(function(reader) {
     // GRIDS
     dir = GLib.get_home_dir() + '/.Builder/Roo.GridPanel'; 
     if (!File.isDirectory(dir)) {
+        print("mkdir " + dir);
         File.mkdir(dir);
     }
     
@@ -632,6 +636,7 @@ readers.forEach(function(reader) {
     
     dir = GLib.get_home_dir() + '/.Builder/Roo.form.Form'; 
     if (!File.isDirectory(dir)) {
+        print("mkdir " + dir);
         File.mkdir(dir);
     }
     var formElements = [];
@@ -641,9 +646,13 @@ readers.forEach(function(reader) {
             continue;
         }
         formHeight += reader.form[k].xtype == 'TextArea' ? 100 : 30;
+        
         formElements.push(reader.form[k]);
     }
-    formElements.push(reader.form['id']);
+    if (reader.form['id']) {
+        formElements.push(reader.form['id']);
+    }
+    
 
     print("WRITE: " +  dir + '/' + cfg.DBNAME + '_' + reader.table + '.json');
     var frmCfg = 
@@ -702,6 +711,7 @@ readers.forEach(function(reader) {
     
     dir = GLib.get_home_dir() + '/.Builder/Roo.form.ComboBox'; 
     if (!File.isDirectory(dir)) {
+        print("mkdir " + dir);
         File.mkdir(dir);
     }
    
@@ -724,6 +734,7 @@ readers.forEach(function(reader) {
    
     dir = GLib.get_home_dir() + '/.Builder/Roo.LayoutDialog'; 
     if (!File.isDirectory(dir)) {
+        print("mkdir " + dir);
         File.mkdir(dir);
     }
     var formElements = [];