Fix conflicts with develop branch

This commit is contained in:
Julio Cesar Laura Avendaño
2020-01-17 11:27:11 -04:00
400 changed files with 7056 additions and 86309 deletions

View File

@@ -0,0 +1,28 @@
<?php
use Faker\Generator as Faker;
$factory->define(\ProcessMaker\Model\AdditionalTables::class, function(Faker $faker) {
return [
'ADD_TAB_UID' => G::generateUniqueID(),
'ADD_TAB_NAME' => $faker->name,
'ADD_TAB_CLASS_NAME' => $faker->name,
'ADD_TAB_DESCRIPTION' => $faker->text,
'ADD_TAB_SDW_LOG_INSERT' => 0,
'ADD_TAB_SDW_LOG_UPDATE' => 0,
'ADD_TAB_SDW_LOG_DELETE' => 0,
'ADD_TAB_SDW_LOG_SELECT' => 0,
'ADD_TAB_SDW_MAX_LENGTH' => 0,
'ADD_TAB_SDW_AUTO_DELETE' => 0,
'ADD_TAB_PLG_UID' => '',
'DBS_UID' => 'workflow',
'PRO_UID' => function() {
return factory(\ProcessMaker\Model\Process::class)->create()->PRO_UID;
},
'ADD_TAB_TYPE' => '',
'ADD_TAB_GRID' => '',
'ADD_TAB_TAG' => '',
'ADD_TAB_OFFLINE' => 0,
'ADD_TAB_UPDATE_DATE' => $faker->dateTime()
];
});

View File

@@ -0,0 +1,50 @@
<?php
use Faker\Generator as Faker;
use ProcessMaker\Model\AdditionalTables;
$factory->define(\ProcessMaker\Model\Fields::class, function (Faker $faker) {
return [
'FLD_UID' => G::generateUniqueID(),
'ADD_TAB_UID' => G::generateUniqueID(),
'FLD_INDEX' => 0,
'FLD_NAME' => 'VAR_' . $faker->sentence(1),
'FLD_DESCRIPTION' => $faker->sentence(2),
'FLD_TYPE' => 'VARCHAR',
'FLD_SIZE' => 255,
'FLD_NULL' => 1,
'FLD_AUTO_INCREMENT' => 0,
'FLD_KEY' => 1,
'FLD_TABLE_INDEX' => 0,
'FLD_FOREIGN_KEY' => 0,
'FLD_FOREIGN_KEY_TABLE' => '',
'FLD_DYN_NAME' => '',
'FLD_DYN_UID' => '',
'FLD_FILTER' => 0,
];
});
// Create columns from a table with the foreign keys
$factory->state(\ProcessMaker\Model\Fields::class, 'foreign_keys', function (Faker $faker) {
return [
'FLD_UID' => G::generateUniqueID(),
'ADD_TAB_UID' => function() {
$table = factory(AdditionalTables::class)->create(['ADD_TAB_OFFLINE' => 1]);
return $table->ADD_TAB_UID;
},
'FLD_INDEX' => 0,
'FLD_NAME' => 'VAR_' . $faker->sentence(1),
'FLD_DESCRIPTION' => $faker->sentence(2),
'FLD_TYPE' => 'VARCHAR',
'FLD_SIZE' => 255,
'FLD_NULL' => 1,
'FLD_AUTO_INCREMENT' => 0,
'FLD_KEY' => 1,
'FLD_TABLE_INDEX' => 0,
'FLD_FOREIGN_KEY' => 0,
'FLD_FOREIGN_KEY_TABLE' => '',
'FLD_DYN_NAME' => '',
'FLD_DYN_UID' => '',
'FLD_FILTER' => 0,
];
});