Download as
Browse Code »

Commit 15d5aef9d9c1c96a3970071206c4cc6a2404f8b0

Authored by Carlos Alberto
1 parent addc0172
Exists in master

Correção de views para dataObject

Showing 7 changed files with 172 additions and 118 deletions   Show diff stats
cit-esi-api/src/main/java/br/com/centralit/esi/api/data/model/Database.java
  Diff comments   View file @15d5aef
@@ -30,7 +30,7 @@ public class Database extends PersistentObjectAudit { @@ -30,7 +30,7 @@ public class Database extends PersistentObjectAudit {
30 30
31 @Id 31 @Id
32 @GeneratedValue(strategy = GenerationType.AUTO) 32 @GeneratedValue(strategy = GenerationType.AUTO)
33 - @JsonView({Views.EsiDataObjectListView.class, Views.EsiDataObjectEditView.class }) 33 + @JsonView({Views.GenericView.class })
34 protected Long id; 34 protected Long id;
35 35
36 @JsonView({ Views.GenericView.class}) 36 @JsonView({ Views.GenericView.class})
@@ -41,11 +41,11 @@ public class Database extends PersistentObjectAudit { @@ -41,11 +41,11 @@ public class Database extends PersistentObjectAudit {
41 private String name; 41 private String name;
42 42
43 @Column(nullable = false, length=100) 43 @Column(nullable = false, length=100)
44 - @JsonView({ Views.EsiDataObjectEditView.class, Views.EsiPackageExportView.class}) 44 + @JsonView({ Views.EsiDatabaseEditView.class, Views.EsiPackageExportView.class})
45 private String driverClassName; 45 private String driverClassName;
46 46
47 @OneToMany(cascade = { CascadeType.ALL }, mappedBy = "database", fetch = FetchType.LAZY) 47 @OneToMany(cascade = { CascadeType.ALL }, mappedBy = "database", fetch = FetchType.LAZY)
48 - @JsonView({ Views.EsiDataObjectEditView.class, Views.EsiPackageExportView.class}) 48 + @JsonView({ Views.EsiPackageExportView.class, Views.EsiDatabaseEditView.class})
49 private List<DatabaseDomain> types; 49 private List<DatabaseDomain> types;
50 50
51 @Override 51 @Override
cit-esi-api/src/main/java/br/com/centralit/esi/api/data/model/DatabaseDomain.java
  Diff comments   View file @15d5aef
@@ -40,7 +40,7 @@ public class DatabaseDomain extends PersistentObject { @@ -40,7 +40,7 @@ public class DatabaseDomain extends PersistentObject {
40 private Database database; 40 private Database database;
41 41
42 @ManyToOne(fetch = FetchType.LAZY, optional = false) 42 @ManyToOne(fetch = FetchType.LAZY, optional = false)
43 - @JsonView({ Views.EsiDataObjectListView.class, Views.EsiDataObjectEditView.class, Views.EsiPackageExportView.class}) 43 + @JsonView({ Views.EsiPackageExportView.class, Views.EsiDatabaseEditView.class})
44 private DataType dataType; 44 private DataType dataType;
45 45
46 public DatabaseDomain() { 46 public DatabaseDomain() {
@@ -86,4 +86,5 @@ public class DatabaseDomain extends PersistentObject { @@ -86,4 +86,5 @@ public class DatabaseDomain extends PersistentObject {
86 this.name = name; 86 this.name = name;
87 } 87 }
88 88
  89 +
89 } 90 }
cit-esi-api/src/main/java/br/com/centralit/esi/api/data/service/impl/DataObjectServiceImpl.java
  Diff comments   View file @15d5aef
@@ -297,10 +297,12 @@ public class DataObjectServiceImpl extends GenericServiceImpl&lt;DataObject, Long&gt; @@ -297,10 +297,12 @@ public class DataObjectServiceImpl extends GenericServiceImpl&lt;DataObject, Long&gt;
297 if (dataObject.getColumns() != null) { 297 if (dataObject.getColumns() != null) {
298 for (DataColumn column : dataObject.getColumns()) { 298 for (DataColumn column : dataObject.getColumns()) {
299 column.setDataObject(dataObject); 299 column.setDataObject(dataObject);
300 - if (column.getWidget() == null) { 300 + if (column.getWidget() == null && column.getType() != null) {
301 column.setWidget(column.getType().getWidget()); 301 column.setWidget(column.getType().getWidget());
302 } 302 }
303 - column.setWidget(formWidgetService.find(column.getWidget().getId())); 303 + if (column.getWidget() != null) {
  304 + column.setWidget(formWidgetService.find(column.getWidget().getId()));
  305 + }
304 } 306 }
305 } 307 }
306 308
cit-esi-api/src/main/resources/scripts-bd/script alteracao_datatype_esi.sql 0 → 100644
  Diff comments   View file @15d5aef
@@ -0,0 +1,6 @@ @@ -0,0 +1,6 @@
  1 +delete from esi_databasedomain;
  2 +
  3 +update esi_datatype set name = 'boolean' where name = 'bit';
  4 +update esi_datatype set name = 'bigdecimal' where name = 'decimal';
  5 +update esi_datatype set name = 'currency' where name = 'money';
  6 +update esi_datatype set name = 'log' where name = 'image';
cit-esi-web/src/main/java/br/com/centralit/controller/DatabaseController.java
  Diff comments   View file @15d5aef
@@ -25,12 +25,12 @@ public class DatabaseController extends GenericController&lt;Database&gt;{ @@ -25,12 +25,12 @@ public class DatabaseController extends GenericController&lt;Database&gt;{
25 25
26 @Override 26 @Override
27 public Class<? extends GenericView> getListView() { 27 public Class<? extends GenericView> getListView() {
28 - return Views.EsiDataObjectListView.class; 28 + return Views.EsiDatabaseListView.class;
29 } 29 }
30 30
31 @Override 31 @Override
32 public Class<? extends GenericView> getEditView() { 32 public Class<? extends GenericView> getEditView() {
33 - return Views.EsiDataObjectEditView.class; 33 + return Views.EsiDatabaseEditView.class;
34 } 34 }
35 35
36 } 36 }
cit-esi-web/src/main/java/br/com/centralit/listener/StartupListenerEsi.java
  Diff comments   View file @15d5aef
@@ -213,10 +213,7 @@ public class StartupListenerEsi extends UtilStartup implements ApplicationListen @@ -213,10 +213,7 @@ public class StartupListenerEsi extends UtilStartup implements ApplicationListen
213 213
214 this.createDatabases(); 214 this.createDatabases();
215 215
216 - List<DataType> datatypes = dataTypeService.findAll();  
217 - if (datatypes == null || datatypes.size() == 0) {  
218 - this.createDatatypes();  
219 - } 216 + this.createDatatypes();
220 217
221 List<Flow> flows = flowService.findAll(); 218 List<Flow> flows = flowService.findAll();
222 if (flows == null || flows.size() == 0) { 219 if (flows == null || flows.size() == 0) {
@@ -333,108 +330,154 @@ public class StartupListenerEsi extends UtilStartup implements ApplicationListen @@ -333,108 +330,154 @@ public class StartupListenerEsi extends UtilStartup implements ApplicationListen
333 FormWidget widgetTextArea = formWidgetService.findByName("text-area"); 330 FormWidget widgetTextArea = formWidgetService.findByName("text-area");
334 331
335 // name, description, javaClass, allowSize, allowGeneratedValue, allowPrecision, allowAutoIncrement, width, widget 332 // name, description, javaClass, allowSize, allowGeneratedValue, allowPrecision, allowAutoIncrement, width, widget
336 - DataType dataType = new DataType("bigint", "Big integer", JavaClassEnum.BIG_INTEGER, false, true, false, true, 2, widgetInteger);  
337 - dataType = dataTypeService.save(dataType);  
338 - databaseDomainService.save(new DatabaseDomain(sqlServer, "bigint", dataType));  
339 - databaseDomainService.save(new DatabaseDomain(mySQL, "bigint", dataType));  
340 - databaseDomainService.save(new DatabaseDomain(postgres, "bigint", dataType));  
341 - databaseDomainService.save(new DatabaseDomain(postgres, "int8", dataType));  
342 - databaseDomainService.save(new DatabaseDomain(oracle, "integer", dataType));  
343 -  
344 - dataType = new DataType("int", "Small integer", JavaClassEnum.INTEGER, false, true, false, true, 2, widgetInteger);  
345 - dataType = dataTypeService.save(dataType);  
346 - databaseDomainService.save(new DatabaseDomain(sqlServer, "int", dataType));  
347 - databaseDomainService.save(new DatabaseDomain(sqlServer, "smallint", dataType));  
348 - databaseDomainService.save(new DatabaseDomain(mySQL, "smallint", dataType));  
349 - databaseDomainService.save(new DatabaseDomain(mySQL, "int", dataType));  
350 - databaseDomainService.save(new DatabaseDomain(postgres, "smallint", dataType));  
351 - databaseDomainService.save(new DatabaseDomain(oracle, "integer", dataType));  
352 -  
353 - dataType = new DataType("integer", "Integer", JavaClassEnum.INTEGER, false, true, false, true, 2, widgetInteger);  
354 - dataType = dataTypeService.save(dataType);  
355 - databaseDomainService.save(new DatabaseDomain(sqlServer, "integer", dataType));  
356 - databaseDomainService.save(new DatabaseDomain(mySQL, "int", dataType));  
357 - databaseDomainService.save(new DatabaseDomain(postgres, "integer", dataType));  
358 - databaseDomainService.save(new DatabaseDomain(oracle, "integer", dataType));  
359 -  
360 - dataType = new DataType("boolean", "Boolean", JavaClassEnum.BOOLEAN, false, false, false, false, 2, widgetCheckbox);  
361 - dataType = dataTypeService.save(dataType);  
362 - databaseDomainService.save(new DatabaseDomain(sqlServer, "bit", dataType));  
363 - databaseDomainService.save(new DatabaseDomain(mySQL, "bit", dataType));  
364 - databaseDomainService.save(new DatabaseDomain(postgres, "bool", dataType));  
365 - databaseDomainService.save(new DatabaseDomain(oracle, "integer", dataType));  
366 -  
367 - dataType = new DataType("bigdecimal", "Big decimal", JavaClassEnum.BIG_DECIMAL, true, false, true, false, 2, widgetDecimal);  
368 - dataType = dataTypeService.save(dataType);  
369 - databaseDomainService.save(new DatabaseDomain(sqlServer, "float", dataType));  
370 - databaseDomainService.save(new DatabaseDomain(sqlServer, "numeric", dataType));  
371 - databaseDomainService.save(new DatabaseDomain(sqlServer, "decimal", dataType));  
372 - databaseDomainService.save(new DatabaseDomain(mySQL, "float", dataType));  
373 - databaseDomainService.save(new DatabaseDomain(mySQL, "numeric", dataType));  
374 - databaseDomainService.save(new DatabaseDomain(mySQL, "decimal", dataType));  
375 - databaseDomainService.save(new DatabaseDomain(postgres, "numeric", dataType));  
376 - databaseDomainService.save(new DatabaseDomain(oracle, "number", dataType));  
377 -  
378 - dataType = new DataType("float", "Float", JavaClassEnum.FLOAT, true, false, true, false, 2, widgetDecimal);  
379 - dataType = dataTypeService.save(dataType);  
380 - databaseDomainService.save(new DatabaseDomain(sqlServer, "float", dataType));  
381 - databaseDomainService.save(new DatabaseDomain(sqlServer,"real", dataType));  
382 - databaseDomainService.save(new DatabaseDomain(mySQL, "double", dataType));  
383 - databaseDomainService.save(new DatabaseDomain(postgres, "numeric", dataType));  
384 - databaseDomainService.save(new DatabaseDomain(postgres,"real", dataType));  
385 - databaseDomainService.save(new DatabaseDomain(oracle, "number", dataType));  
386 -  
387 - dataType = new DataType("currency", "Currency", JavaClassEnum.CURRENCY, false, false, false, false, 2, widgetMoney);  
388 - dataType = dataTypeService.save(dataType);  
389 - databaseDomainService.save(new DatabaseDomain(sqlServer, "money", dataType));  
390 - databaseDomainService.save(new DatabaseDomain(sqlServer, "smallmoney", dataType));  
391 - databaseDomainService.save(new DatabaseDomain(mySQL, "float", dataType));  
392 - databaseDomainService.save(new DatabaseDomain(postgres, "money", dataType));  
393 - databaseDomainService.save(new DatabaseDomain(oracle, "number", dataType));  
394 -  
395 - dataType = new DataType("date", "Date", JavaClassEnum.DATE, false, false, false, false, 2, widgetDate);  
396 - dataType = dataTypeService.save(dataType);  
397 - databaseDomainService.save(new DatabaseDomain(sqlServer, "datetime", dataType));  
398 - databaseDomainService.save(new DatabaseDomain(sqlServer, "smalldatetime", dataType));  
399 - databaseDomainService.save(new DatabaseDomain(mySQL, "datetime", dataType));  
400 - databaseDomainService.save(new DatabaseDomain(postgres, "date", dataType));  
401 - databaseDomainService.save(new DatabaseDomain(oracle, "date", dataType));  
402 -  
403 - dataType = new DataType("datetime", "Datetime", JavaClassEnum.DATE, false, false, false, false, 2, widgetDate);  
404 - dataType = dataTypeService.save(dataType);  
405 - databaseDomainService.save(new DatabaseDomain(sqlServer, "datetime", dataType));  
406 - databaseDomainService.save(new DatabaseDomain(mySQL, "timestamp", dataType));  
407 - databaseDomainService.save(new DatabaseDomain(postgres, "timestamp", dataType));  
408 - databaseDomainService.save(new DatabaseDomain(oracle, "timestamp", dataType));  
409 -  
410 - dataType = new DataType("char", "Character", JavaClassEnum.STRING, true, false, false, false, 4, widgetText);  
411 - dataType = dataTypeService.save(dataType);  
412 - databaseDomainService.save(new DatabaseDomain(sqlServer, "char", dataType));  
413 - databaseDomainService.save(new DatabaseDomain(sqlServer, "nchar", dataType));  
414 - databaseDomainService.save(new DatabaseDomain(mySQL, "char", dataType));  
415 - databaseDomainService.save(new DatabaseDomain(postgres, "character", dataType));  
416 - databaseDomainService.save(new DatabaseDomain(oracle, "char", dataType));  
417 - databaseDomainService.save(new DatabaseDomain(oracle, "nchar", dataType));  
418 -  
419 - dataType = new DataType("varchar", "Text", JavaClassEnum.STRING, true, false, false, false, 4, widgetText);  
420 - dataType = dataTypeService.save(dataType);  
421 - databaseDomainService.save(new DatabaseDomain(sqlServer, "varchar", dataType));  
422 - databaseDomainService.save(new DatabaseDomain(sqlServer, "nvarchar", dataType));  
423 - databaseDomainService.save(new DatabaseDomain(sqlServer, "varchar(max)", dataType));  
424 - databaseDomainService.save(new DatabaseDomain(mySQL, "varchar", dataType));  
425 - databaseDomainService.save(new DatabaseDomain(postgres, "varchar", dataType));  
426 - databaseDomainService.save(new DatabaseDomain(oracle, "varchar2", dataType));  
427 - databaseDomainService.save(new DatabaseDomain(oracle, "nvarchar2", dataType));  
428 - databaseDomainService.save(new DatabaseDomain(oracle, "varchar", dataType));  
429 -  
430 - dataType = new DataType("text", "Long text", JavaClassEnum.STRING, true, false, false, false, 6, widgetTextArea);  
431 - dataType = dataTypeService.save(dataType);  
432 - databaseDomainService.save(new DatabaseDomain(sqlServer, "text", dataType));  
433 - databaseDomainService.save(new DatabaseDomain(sqlServer, "ntext", dataType));  
434 - databaseDomainService.save(new DatabaseDomain(mySQL, "text", dataType));  
435 - databaseDomainService.save(new DatabaseDomain(postgres, "text", dataType));  
436 - databaseDomainService.save(new DatabaseDomain(oracle, "clob", dataType));  
437 - databaseDomainService.save(new DatabaseDomain(oracle, "nclob", dataType)); 333 + DataType dataType = dataTypeService.findByName("bigint");
  334 + if (dataType == null) {
  335 + dataType = new DataType("bigint", "Big integer", JavaClassEnum.BIG_INTEGER, false, true, false, true, 2, widgetInteger);
  336 + dataType = dataTypeService.save(dataType);
  337 + }
  338 + databaseDomainService.saveIfNotExist(new DatabaseDomain(sqlServer, "bigint", dataType));
  339 + databaseDomainService.saveIfNotExist(new DatabaseDomain(mySQL, "bigint", dataType));
  340 + databaseDomainService.saveIfNotExist(new DatabaseDomain(postgres, "bigint", dataType));
  341 + databaseDomainService.saveIfNotExist(new DatabaseDomain(postgres, "int8", dataType));
  342 + databaseDomainService.saveIfNotExist(new DatabaseDomain(oracle, "integer", dataType));
  343 +
  344 + dataType = dataTypeService.findByName("int");
  345 + if (dataType == null) {
  346 + dataType = new DataType("int", "Small integer", JavaClassEnum.INTEGER, false, true, false, true, 2, widgetInteger);
  347 + dataType = dataTypeService.save(dataType);
  348 + }
  349 + databaseDomainService.saveIfNotExist(new DatabaseDomain(sqlServer, "int", dataType));
  350 + databaseDomainService.saveIfNotExist(new DatabaseDomain(sqlServer, "smallint", dataType));
  351 + databaseDomainService.saveIfNotExist(new DatabaseDomain(mySQL, "smallint", dataType));
  352 + databaseDomainService.saveIfNotExist(new DatabaseDomain(mySQL, "int", dataType));
  353 + databaseDomainService.saveIfNotExist(new DatabaseDomain(postgres, "smallint", dataType));
  354 + databaseDomainService.saveIfNotExist(new DatabaseDomain(oracle, "integer", dataType));
  355 +
  356 + dataType = dataTypeService.findByName("integer");
  357 + if (dataType == null) {
  358 + dataType = new DataType("integer", "Integer", JavaClassEnum.INTEGER, false, true, false, true, 2, widgetInteger);
  359 + dataType = dataTypeService.save(dataType);
  360 + }
  361 + databaseDomainService.saveIfNotExist(new DatabaseDomain(sqlServer, "integer", dataType));
  362 + databaseDomainService.saveIfNotExist(new DatabaseDomain(mySQL, "int", dataType));
  363 + databaseDomainService.saveIfNotExist(new DatabaseDomain(postgres, "integer", dataType));
  364 + databaseDomainService.saveIfNotExist(new DatabaseDomain(oracle, "integer", dataType));
  365 +
  366 + dataType = dataTypeService.findByName("boolean");
  367 + if (dataType == null) {
  368 + dataType = new DataType("boolean", "Boolean", JavaClassEnum.BOOLEAN, false, false, false, false, 2, widgetCheckbox);
  369 + dataType = dataTypeService.save(dataType);
  370 + }
  371 + databaseDomainService.saveIfNotExist(new DatabaseDomain(sqlServer, "bit", dataType));
  372 + databaseDomainService.saveIfNotExist(new DatabaseDomain(mySQL, "bit", dataType));
  373 + databaseDomainService.saveIfNotExist(new DatabaseDomain(postgres, "bool", dataType));
  374 + databaseDomainService.saveIfNotExist(new DatabaseDomain(oracle, "integer", dataType));
  375 +
  376 + dataType = dataTypeService.findByName("bigdecimal");
  377 + if (dataType == null) {
  378 + dataType = new DataType("bigdecimal", "Big decimal", JavaClassEnum.BIG_DECIMAL, true, false, true, false, 2, widgetDecimal);
  379 + dataType = dataTypeService.save(dataType);
  380 + }
  381 + databaseDomainService.saveIfNotExist(new DatabaseDomain(sqlServer, "float", dataType));
  382 + databaseDomainService.saveIfNotExist(new DatabaseDomain(sqlServer, "numeric", dataType));
  383 + databaseDomainService.saveIfNotExist(new DatabaseDomain(sqlServer, "decimal", dataType));
  384 + databaseDomainService.saveIfNotExist(new DatabaseDomain(mySQL, "float", dataType));
  385 + databaseDomainService.saveIfNotExist(new DatabaseDomain(mySQL, "numeric", dataType));
  386 + databaseDomainService.saveIfNotExist(new DatabaseDomain(mySQL, "decimal", dataType));
  387 + databaseDomainService.saveIfNotExist(new DatabaseDomain(postgres, "numeric", dataType));
  388 + databaseDomainService.saveIfNotExist(new DatabaseDomain(oracle, "number", dataType));
  389 +
  390 + dataType = dataTypeService.findByName("float");
  391 + if (dataType == null) {
  392 + dataType = new DataType("float", "Decimal", JavaClassEnum.FLOAT, true, false, true, false, 2, widgetDecimal);
  393 + dataType = dataTypeService.save(dataType);
  394 + }
  395 + databaseDomainService.saveIfNotExist(new DatabaseDomain(sqlServer, "float", dataType));
  396 + databaseDomainService.saveIfNotExist(new DatabaseDomain(sqlServer,"real", dataType));
  397 + databaseDomainService.saveIfNotExist(new DatabaseDomain(mySQL, "double", dataType));
  398 + databaseDomainService.saveIfNotExist(new DatabaseDomain(postgres, "numeric", dataType));
  399 + databaseDomainService.saveIfNotExist(new DatabaseDomain(postgres,"real", dataType));
  400 + databaseDomainService.saveIfNotExist(new DatabaseDomain(oracle, "number", dataType));
  401 +
  402 + dataType = dataTypeService.findByName("currency");
  403 + if (dataType == null) {
  404 + dataType = new DataType("currency", "Currency", JavaClassEnum.CURRENCY, false, false, false, false, 2, widgetMoney);
  405 + dataType = dataTypeService.save(dataType);
  406 + }
  407 + databaseDomainService.saveIfNotExist(new DatabaseDomain(sqlServer, "money", dataType));
  408 + databaseDomainService.saveIfNotExist(new DatabaseDomain(sqlServer, "smallmoney", dataType));
  409 + databaseDomainService.saveIfNotExist(new DatabaseDomain(mySQL, "float", dataType));
  410 + databaseDomainService.saveIfNotExist(new DatabaseDomain(postgres, "money", dataType));
  411 + databaseDomainService.saveIfNotExist(new DatabaseDomain(oracle, "number", dataType));
  412 +
  413 + dataType = dataTypeService.findByName("date");
  414 + if (dataType == null) {
  415 + dataType = new DataType("date", "Date", JavaClassEnum.DATE, false, false, false, false, 2, widgetDate);
  416 + dataType = dataTypeService.save(dataType);
  417 + }
  418 + databaseDomainService.saveIfNotExist(new DatabaseDomain(sqlServer, "datetime", dataType));
  419 + databaseDomainService.saveIfNotExist(new DatabaseDomain(sqlServer, "smalldatetime", dataType));
  420 + databaseDomainService.saveIfNotExist(new DatabaseDomain(mySQL, "datetime", dataType));
  421 + databaseDomainService.saveIfNotExist(new DatabaseDomain(postgres, "date", dataType));
  422 + databaseDomainService.saveIfNotExist(new DatabaseDomain(oracle, "date", dataType));
  423 +
  424 + dataType = dataTypeService.findByName("datetime");
  425 + if (dataType == null) {
  426 + dataType = new DataType("datetime", "Datetime", JavaClassEnum.DATE, false, false, false, false, 2, widgetDate);
  427 + dataType = dataTypeService.save(dataType);
  428 + }
  429 + databaseDomainService.saveIfNotExist(new DatabaseDomain(sqlServer, "datetime", dataType));
  430 + databaseDomainService.saveIfNotExist(new DatabaseDomain(mySQL, "timestamp", dataType));
  431 + databaseDomainService.saveIfNotExist(new DatabaseDomain(postgres, "timestamp", dataType));
  432 + databaseDomainService.saveIfNotExist(new DatabaseDomain(oracle, "timestamp", dataType));
  433 +
  434 + dataType = dataTypeService.findByName("char");
  435 + if (dataType == null) {
  436 + dataType = new DataType("char", "Character", JavaClassEnum.STRING, true, false, false, false, 4, widgetText);
  437 + dataType = dataTypeService.save(dataType);
  438 + }
  439 + databaseDomainService.saveIfNotExist(new DatabaseDomain(sqlServer, "char", dataType));
  440 + databaseDomainService.saveIfNotExist(new DatabaseDomain(sqlServer, "nchar", dataType));
  441 + databaseDomainService.saveIfNotExist(new DatabaseDomain(mySQL, "char", dataType));
  442 + databaseDomainService.saveIfNotExist(new DatabaseDomain(postgres, "character", dataType));
  443 + databaseDomainService.saveIfNotExist(new DatabaseDomain(oracle, "char", dataType));
  444 + databaseDomainService.saveIfNotExist(new DatabaseDomain(oracle, "nchar", dataType));
  445 +
  446 + dataType = dataTypeService.findByName("varchar");
  447 + if (dataType == null) {
  448 + dataType = new DataType("varchar", "Text", JavaClassEnum.STRING, true, false, false, false, 4, widgetText);
  449 + dataType = dataTypeService.save(dataType);
  450 + }
  451 + databaseDomainService.saveIfNotExist(new DatabaseDomain(sqlServer, "varchar", dataType));
  452 + databaseDomainService.saveIfNotExist(new DatabaseDomain(sqlServer, "nvarchar", dataType));
  453 + databaseDomainService.saveIfNotExist(new DatabaseDomain(sqlServer, "varchar(max)", dataType));
  454 + databaseDomainService.saveIfNotExist(new DatabaseDomain(mySQL, "varchar", dataType));
  455 + databaseDomainService.saveIfNotExist(new DatabaseDomain(postgres, "varchar", dataType));
  456 + databaseDomainService.saveIfNotExist(new DatabaseDomain(oracle, "varchar2", dataType));
  457 + databaseDomainService.saveIfNotExist(new DatabaseDomain(oracle, "nvarchar2", dataType));
  458 + databaseDomainService.saveIfNotExist(new DatabaseDomain(oracle, "varchar", dataType));
  459 +
  460 + dataType = dataTypeService.findByName("text");
  461 + if (dataType == null) {
  462 + dataType = new DataType("text", "Long text", JavaClassEnum.STRING, true, false, false, false, 6, widgetTextArea);
  463 + dataType = dataTypeService.save(dataType);
  464 + }
  465 + databaseDomainService.saveIfNotExist(new DatabaseDomain(sqlServer, "text", dataType));
  466 + databaseDomainService.saveIfNotExist(new DatabaseDomain(sqlServer, "ntext", dataType));
  467 + databaseDomainService.saveIfNotExist(new DatabaseDomain(mySQL, "text", dataType));
  468 + databaseDomainService.saveIfNotExist(new DatabaseDomain(postgres, "text", dataType));
  469 + databaseDomainService.saveIfNotExist(new DatabaseDomain(oracle, "clob", dataType));
  470 + databaseDomainService.saveIfNotExist(new DatabaseDomain(oracle, "nclob", dataType));
  471 +
  472 + dataType = dataTypeService.findByName("lob");
  473 + if (dataType == null) {
  474 + dataType = new DataType("lob", "Lob", JavaClassEnum.STRING, true, false, false, false, 6, widgetTextArea);
  475 + dataType = dataTypeService.save(dataType);
  476 + }
  477 + databaseDomainService.saveIfNotExist(new DatabaseDomain(sqlServer, "text", dataType));
  478 + databaseDomainService.saveIfNotExist(new DatabaseDomain(mySQL, "text", dataType));
  479 + databaseDomainService.saveIfNotExist(new DatabaseDomain(postgres, "text", dataType));
  480 + databaseDomainService.saveIfNotExist(new DatabaseDomain(oracle, "clob", dataType));
438 } 481 }
439 482
440 private void createDatabases() { 483 private void createDatabases() {
cit-esi-web/src/main/webapp/assets/js/angular/custom/controller/DataObjectController.js
  Diff comments   View file @15d5aef
1 'use strict'; 1 'use strict';
2 2
3 -citApp.controller('DataObjectController', ["$scope", "FlowRepository", "DataObjectRepository", "DataSourceRepository", "DataTypeRepository", "ParameterRepository", "FormWidgetRepository", "FormBuilderRepository", "MenuRepository", "appService", "$filter", "$translate", "DomainRepository", "$timeout", "$rootScope", "$modal",  
4 - function DataObjectController($scope, FlowRepository, DataObjectRepository, DataSourceRepository, DataTypeRepository, ParameterRepository, FormWidgetRepository, FormBuilderRepository, MenuRepository, appService, $filter, $translate, DomainRepository, $timeout, $rootScope, $modal) { 3 +citApp.controller('DataObjectController', ["$scope", "FlowRepository", "DataObjectRepository", "DataSourceRepository", "DatabaseRepository", "DataTypeRepository", "ParameterRepository", "FormWidgetRepository", "FormBuilderRepository", "MenuRepository", "appService", "$filter", "$translate", "DomainRepository", "$timeout", "$rootScope", "$modal",
  4 + function DataObjectController($scope, FlowRepository, DataObjectRepository, DataSourceRepository, DatabaseRepository, DataTypeRepository, ParameterRepository, FormWidgetRepository, FormBuilderRepository, MenuRepository, appService, $filter, $translate, DomainRepository, $timeout, $rootScope, $modal) {
5 5
6 var componentsPage = '/cit-esi-web/assets/js/angular/custom/directive/html/formComponents.html'; 6 var componentsPage = '/cit-esi-web/assets/js/angular/custom/directive/html/formComponents.html';
7 $scope.appController = angular.element("#citapp-controller").scope(); 7 $scope.appController = angular.element("#citapp-controller").scope();
@@ -229,7 +229,9 @@ citApp.controller(&#39;DataObjectController&#39;, [&quot;$scope&quot;, &quot;FlowRepository&quot;, &quot;DataObje @@ -229,7 +229,9 @@ citApp.controller(&#39;DataObjectController&#39;, [&quot;$scope&quot;, &quot;FlowRepository&quot;, &quot;DataObje
229 $scope.getDatabaseDomains = function(dataSource) { 229 $scope.getDatabaseDomains = function(dataSource) {
230 $scope.databaseDomains = []; 230 $scope.databaseDomains = [];
231 DataSourceRepository.get(dataSource.id).then(function(result) { 231 DataSourceRepository.get(dataSource.id).then(function(result) {
232 - $scope.databaseDomains = result.database.types; 232 + DatabaseRepository.get(dataSource.database.id).then(function(result) {
  233 + $scope.databaseDomains = result.types;
  234 + });
233 }); 235 });
234 }; 236 };
235 237
@@ -608,7 +610,7 @@ citApp.controller(&#39;DataObjectController&#39;, [&quot;$scope&quot;, &quot;FlowRepository&quot;, &quot;DataObje @@ -608,7 +610,7 @@ citApp.controller(&#39;DataObjectController&#39;, [&quot;$scope&quot;, &quot;FlowRepository&quot;, &quot;DataObje
608 }); 610 });
609 $scope.column.databaseType = ''; 611 $scope.column.databaseType = '';
610 angular.forEach($scope.databaseDomains, function(domain){ 612 angular.forEach($scope.databaseDomains, function(domain){
611 - if (domain.dataType.id == type.id && $scope.column.databaseType == '') { 613 + if (domain.dataType_id == type.id && $scope.column.databaseType == '') {
612 $scope.column.databaseType = domain.name; 614 $scope.column.databaseType = domain.name;
613 } 615 }
614 }); 616 });