fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HOR-4481

Browse Source
This commit is contained in:
Roly Rudy Gutierrez Pinto
2018-06-07 15:41:10 -04:00
parent 64abbbd887
commit 428b9d0055
10 changed files with 318 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

179
workflow/engine/classes/WorkspaceTools.php
View File

@@ -2,10 +2,11 @@
use Illuminate\Database\QueryException;
use Illuminate\Support\Facades\DB;
use ProcessMaker\ChangeLog\ChangeLog;
use ProcessMaker\Core\Installer;
use ProcessMaker\Core\System;
use ProcessMaker\Util\FixReferencePath;
use ProcessMaker\Plugins\Adapters\PluginAdapter;
use ProcessMaker\Util\FixReferencePath;
/**
* class workspaceTools.
@@ -221,7 +222,7 @@ class WorkspaceTools
*
* @return void
*/
public function upgrade($buildCacheView = false, $workSpace = null, $onedb = false, $lang = 'en', array $arrayOptTranslation = null)
public function upgrade($buildCacheView = false, $workSpace = null, $onedb = false, $lang = 'en', array $arrayOptTranslation = null, $optionMigrateHistoryData = [])
{
if ($workSpace === null) {
$workSpace = config("system.workspace");
@@ -339,6 +340,13 @@ class WorkspaceTools
$this->migrateSingleton($workSpace);
$stop = microtime(true);
CLI::logging("<*> Migrating and populating plugin singleton data took " . ($stop - $start) . " seconds.\n");
$includeDynContent = isset($optionMigrateHistoryData['includeDynContent']) && $optionMigrateHistoryData['includeDynContent'] === true;
$start = microtime(true);
CLI::logging("> Migrating history data...\n");
$this->migrateAppHistoryToAppDataChangeLog(false, !$includeDynContent);
$stop = microtime(true);
CLI::logging("<*> Migrating history data took " . ($stop - $start) . " seconds.\n");
}
/**
@@ -1806,7 +1814,7 @@ class WorkspaceTools
* @param string $lang for define the language
* @param string $port of database if is empty take 3306
*/
public static function restore($filename, $srcWorkspace, $dstWorkspace = null, $overwrite = true, $lang = 'en', $port = '')
public static function restore($filename, $srcWorkspace, $dstWorkspace = null, $overwrite = true, $lang = 'en', $port = '', $optionMigrateHistoryData = [])
{
$backup = new Archive_Tar($filename);
//Get a temporary directory in the upgrade directory
@@ -2054,6 +2062,12 @@ class WorkspaceTools
//Updating generated class files for PM Tables
passthru(PHP_BINARY . ' processmaker regenerate-pmtable-classes ' . $workspace->name);
$includeDynContent = isset($optionMigrateHistoryData['includeDynContent']) && $optionMigrateHistoryData['includeDynContent'] === true;
$start = microtime(true);
CLI::logging("> Migrating history data...\n");
$workspace->migrateAppHistoryToAppDataChangeLog(false, !$includeDynContent);
$stop = microtime(true);
CLI::logging("<*> Migrating history data took " . ($stop - $start) . " seconds.\n");
}
CLI::logging("Removing temporary files\n");
@@ -4194,4 +4208,163 @@ class WorkspaceTools
$this->setLastContentMigrateTable(true);
}
}
/**
* Migrate the contents of table APP_HISTORY to table APP_DATA_CHANGE_LOG.
*
* @param boolean $force
* @param boolean $removedDynContentHistory
* @return void
*/
public function migrateAppHistoryToAppDataChangeLog($force = false, $removedDynContentHistory = false)
{
$this->initPropel(true);
$conf = new Configurations();
$exist = $conf->exists('MIGRATED_APP_HISTORY', 'history');
if ($exist === true && $force === false) {
$config = (object) $conf->load('MIGRATED_APP_HISTORY', 'history');
if ($config->updated) {
CLI::logging("> This was previously updated.\n");
return;
}
}
$remove = ""
. "CONCAT( "
. " SUBSTRING_INDEX(A.HISTORY_DATA, ':', 1), "
. " ':', "
. " CAST( "
. " SUBSTRING( "
. " SUBSTRING_INDEX(A.HISTORY_DATA, ':{', 1), "
. " LOCATE(':', A.HISTORY_DATA)+1 "
. " ) AS SIGNED "
. " )-1, "
. " SUBSTRING( "
. " CONCAT( "
. " SUBSTRING_INDEX(A.HISTORY_DATA, 's:19:\"DYN_CONTENT_HISTORY\";s:', 1), "
. " SUBSTRING( "
. " SUBSTRING( "
. " A.HISTORY_DATA, "
. " LOCATE('s:19:\"DYN_CONTENT_HISTORY\";s:', A.HISTORY_DATA)+29 "
. " ), "
. " LOCATE( "
. " '\";', "
. " SUBSTRING( "
. " A.HISTORY_DATA, "
. " LOCATE('s:19:\"DYN_CONTENT_HISTORY\";s:', A.HISTORY_DATA)+29 "
. " ) "
. " )+2 "
. " ) "
. " ), "
. " LOCATE(':{', A.HISTORY_DATA) "
. " ) "
. ") ";
$select = ""
. "SELECT "
. "A.HISTORY_DATE AS 'DATE', "
. "B.APP_NUMBER AS 'APP_NUMBER', "
. "A.DEL_INDEX AS 'DEL_INDEX', "
. "C.PRO_ID AS 'PRO_ID', "
. "D.TAS_ID AS 'TAS_ID', "
. "E.USR_ID AS 'USR_ID', "
. "IF( "
. " A.OBJ_TYPE='DYNAFORM', "
. " " . ChangeLog::DYNAFORM . ", "
. " IF( "
. " A.OBJ_TYPE='OUTPUT_DOCUMENT', "
. " " . ChangeLog::OUTPUT_DOCUMENT . ", "
. " IF( "
. " A.OBJ_TYPE='INPUT_DOCUMENT', "
. " " . ChangeLog::INPUT_DOCUMENT . ", "
. " IF( "
. " A.OBJ_TYPE='ASSIGN_TASK', "
. " " . ChangeLog::TRIGGER . ", "
. " IF( "
. " A.OBJ_TYPE='EXTERNAL', "
. " " . ChangeLog::EXTERNAL_STEP . ", "
. " 0 "
. " ) "
. " ) "
. " ) "
. " ) "
. ") AS 'OBJECT_TYPE', "
. "IF( "
. " F.DYN_ID IS NOT NULL, "
. " F.DYN_ID, "
. " IF( "
. " G.OUT_DOC_ID IS NOT NULL, "
. " G.OUT_DOC_ID, "
. " IF( "
. " H.INP_DOC_ID IS NOT NULL, "
. " H.INP_DOC_ID, "
. " 0 "
. " ) "
. " ) "
. ") AS 'OBJECT_ID', "
. "IF( "
. " A.DYN_UID='-1' OR A.DYN_UID='-2', "
. " 0,"
. " A.DYN_UID "
. ") AS 'OBJECT_UID', "
. "IF( "
. " A.DYN_UID='-1', "
. " " . ChangeLog::BEFORE_ASSIGNMENT . ", "
. " IF( "
. " A.DYN_UID='-2', "
. " " . ChangeLog::UNKNOW_STEP . ", "
. " " . ChangeLog::UNKNOW_STEP . " "
. " ) "
. ") AS 'EXECUTED_AT', "
. "" . ChangeLog::FromWeb . " AS 'SOURCE_ID', "
. "IF(LOCATE('DYN_CONTENT_HISTORY',A.HISTORY_DATA)>0 AND " . ($removedDynContentHistory ? 'true' : 'false') . "=true, " . $remove . ", A.HISTORY_DATA) AS 'DATA', "
. "IF(LOCATE('SYS_SKIN',B.APP_DATA)>0, SUBSTRING_INDEX(SUBSTRING(B.APP_DATA, LOCATE('SYS_SKIN',B.APP_DATA)+16),'\"',1), '') AS 'SKIN', "
. "IF(LOCATE('SYS_LANG',B.APP_DATA)>0, SUBSTRING(B.APP_DATA, LOCATE('SYS_LANG',B.APP_DATA)+15,2), '') AS 'LANGUAGE', "
. "1 AS ROW_MIGRATION "
. "FROM " . $this->dbName . ".APP_HISTORY AS A "
. "LEFT JOIN " . $this->dbName . ".APPLICATION AS B ON (B.APP_UID=A.APP_UID) "
. "LEFT JOIN " . $this->dbName . ".PROCESS AS C ON (C.PRO_UID=A.PRO_UID) "
. "LEFT JOIN " . $this->dbName . ".TASK AS D ON (D.TAS_UID=A.TAS_UID) "
. "LEFT JOIN " . $this->dbName . ".USERS AS E ON (E.USR_UID=A.USR_UID) "
. "LEFT JOIN " . $this->dbName . ".DYNAFORM AS F ON (F.DYN_UID=A.DYN_UID) "
. "LEFT JOIN " . $this->dbName . ".OUTPUT_DOCUMENT AS G ON (G.OUT_DOC_UID=A.DYN_UID) "
. "LEFT JOIN " . $this->dbName . ".INPUT_DOCUMENT AS H ON (H.INP_DOC_UID=A.DYN_UID) ";
$delete = ""
. "DELETE FROM " . $this->dbName . ".APP_DATA_CHANGE_LOG "
. "WHERE "
. "ROW_MIGRATION=1";
$insert = ""
. "INSERT INTO " . $this->dbName . ".APP_DATA_CHANGE_LOG ( "
. " DATE, "
. " APP_NUMBER, "
. " DEL_INDEX, "
. " PRO_ID, "
. " TAS_ID, "
. " USR_ID, "
. " OBJECT_TYPE, "
. " OBJECT_ID, "
. " OBJECT_UID, "
. " EXECUTED_AT, "
. " SOURCE_ID, "
. " DATA, "
. " SKIN, "
. " LANGUAGE, "
. " ROW_MIGRATION "
. ") "
. $select;
$con = Propel::getConnection("workflow");
$stmt = $con->createStatement();
$stmt->executeQuery($delete);
CLI::logging("-> Table cleaning finished for " . $this->dbName . ".APP_DATA_CHANGE_LOG\n");
$stmt = $con->createStatement();
$stmt->executeQuery($insert);
CLI::logging("-> Completed migration in table " . $this->dbName . ".APP_DATA_CHANGE_LOG\n");
$conf->aConfig = ['updated' => true];
$conf->saveConfig('MIGRATED_APP_HISTORY', 'history');
}
}

2
workflow/engine/classes/model/map/AppDataChangeLogMapBuilder.php
View File

@@ -95,6 +95,8 @@ class AppDataChangeLogMapBuilder
$tMap->addColumn('LANGUAGE', 'Language', 'string', CreoleTypes::VARCHAR, false, 32);
$tMap->addColumn('ROW_MIGRATION', 'RowMigration', 'int', CreoleTypes::INTEGER, false, null);
} // doBuild()
} // AppDataChangeLogMapBuilder

60
workflow/engine/classes/model/om/BaseAppDataChangeLog.php
View File

@@ -117,6 +117,12 @@ abstract class BaseAppDataChangeLog extends BaseObject implements Persistent
*/
protected $language = '';
/**
* The value for the row_migration field.
* @var int
*/
protected $row_migration = 0;
/**
* Flag to prevent endless save loop, if this object is referenced
* by another object which falls in this transaction.
@@ -317,6 +323,17 @@ abstract class BaseAppDataChangeLog extends BaseObject implements Persistent
return $this->language;
}
/**
* Get the [row_migration] column value.
*
* @return int
*/
public function getRowMigration()
{
return $this->row_migration;
}
/**
* Set the value of [change_log_id] column.
*
@@ -654,6 +671,28 @@ abstract class BaseAppDataChangeLog extends BaseObject implements Persistent
} // setLanguage()
/**
* Set the value of [row_migration] column.
*
* @param int $v new value
* @return void
*/
public function setRowMigration($v)
{
// Since the native PHP type for this column is integer,
// we will cast the input value to an int (if it is not).
if ($v !== null && !is_int($v) && is_numeric($v)) {
$v = (int) $v;
}
if ($this->row_migration !== $v || $v === 0) {
$this->row_migration = $v;
$this->modifiedColumns[] = AppDataChangeLogPeer::ROW_MIGRATION;
}
} // setRowMigration()
/**
* Hydrates (populates) the object variables with values from the database resultset.
*
@@ -701,12 +740,14 @@ abstract class BaseAppDataChangeLog extends BaseObject implements Persistent
$this->language = $rs->getString($startcol + 14);
$this->row_migration = $rs->getInt($startcol + 15);
$this->resetModified();
$this->setNew(false);
// FIXME - using NUM_COLUMNS may be clearer.
return $startcol + 15; // 15 = AppDataChangeLogPeer::NUM_COLUMNS - AppDataChangeLogPeer::NUM_LAZY_LOAD_COLUMNS).
return $startcol + 16; // 16 = AppDataChangeLogPeer::NUM_COLUMNS - AppDataChangeLogPeer::NUM_LAZY_LOAD_COLUMNS).
} catch (Exception $e) {
throw new PropelException("Error populating AppDataChangeLog object", $e);
@@ -957,6 +998,9 @@ abstract class BaseAppDataChangeLog extends BaseObject implements Persistent
case 14:
return $this->getLanguage();
break;
case 15:
return $this->getRowMigration();
break;
default:
return null;
break;
@@ -992,6 +1036,7 @@ abstract class BaseAppDataChangeLog extends BaseObject implements Persistent
$keys[12] => $this->getData(),
$keys[13] => $this->getSkin(),
$keys[14] => $this->getLanguage(),
$keys[15] => $this->getRowMigration(),
);
return $result;
}
@@ -1068,6 +1113,9 @@ abstract class BaseAppDataChangeLog extends BaseObject implements Persistent
case 14:
$this->setLanguage($value);
break;
case 15:
$this->setRowMigration($value);
break;
} // switch()
}
@@ -1151,6 +1199,10 @@ abstract class BaseAppDataChangeLog extends BaseObject implements Persistent
$this->setLanguage($arr[$keys[14]]);
}
if (array_key_exists($keys[15], $arr)) {
$this->setRowMigration($arr[$keys[15]]);
}
}
/**
@@ -1222,6 +1274,10 @@ abstract class BaseAppDataChangeLog extends BaseObject implements Persistent
$criteria->add(AppDataChangeLogPeer::LANGUAGE, $this->language);
}
if ($this->isColumnModified(AppDataChangeLogPeer::ROW_MIGRATION)) {
$criteria->add(AppDataChangeLogPeer::ROW_MIGRATION, $this->row_migration);
}
return $criteria;
}
@@ -1304,6 +1360,8 @@ abstract class BaseAppDataChangeLog extends BaseObject implements Persistent
$copyObj->setLanguage($this->language);
$copyObj->setRowMigration($this->row_migration);
$copyObj->setNew(true);

23
workflow/engine/classes/model/om/BaseAppDataChangeLogPeer.php
View File

@@ -25,7 +25,7 @@ abstract class BaseAppDataChangeLogPeer
const CLASS_DEFAULT = 'classes.model.AppDataChangeLog';
/** The total number of columns. */
const NUM_COLUMNS = 15;
const NUM_COLUMNS = 16;
/** The number of lazy-loaded columns. */
const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -76,6 +76,9 @@ abstract class BaseAppDataChangeLogPeer
/** the column name for the LANGUAGE field */
const LANGUAGE = 'APP_DATA_CHANGE_LOG.LANGUAGE';
/** the column name for the ROW_MIGRATION field */
const ROW_MIGRATION = 'APP_DATA_CHANGE_LOG.ROW_MIGRATION';
/** The PHP to DB Name Mapping */
private static $phpNameMap = null;
@@ -87,10 +90,10 @@ abstract class BaseAppDataChangeLogPeer
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/
private static $fieldNames = array (
BasePeer::TYPE_PHPNAME => array ('ChangeLogId', 'Date', 'AppNumber', 'DelIndex', 'ProId', 'TasId', 'UsrId', 'ObjectType', 'ObjectId', 'ObjectUid', 'ExecutedAt', 'SourceId', 'Data', 'Skin', 'Language', ),
BasePeer::TYPE_COLNAME => array (AppDataChangeLogPeer::CHANGE_LOG_ID, AppDataChangeLogPeer::DATE, AppDataChangeLogPeer::APP_NUMBER, AppDataChangeLogPeer::DEL_INDEX, AppDataChangeLogPeer::PRO_ID, AppDataChangeLogPeer::TAS_ID, AppDataChangeLogPeer::USR_ID, AppDataChangeLogPeer::OBJECT_TYPE, AppDataChangeLogPeer::OBJECT_ID, AppDataChangeLogPeer::OBJECT_UID, AppDataChangeLogPeer::EXECUTED_AT, AppDataChangeLogPeer::SOURCE_ID, AppDataChangeLogPeer::DATA, AppDataChangeLogPeer::SKIN, AppDataChangeLogPeer::LANGUAGE, ),
BasePeer::TYPE_FIELDNAME => array ('CHANGE_LOG_ID', 'DATE', 'APP_NUMBER', 'DEL_INDEX', 'PRO_ID', 'TAS_ID', 'USR_ID', 'OBJECT_TYPE', 'OBJECT_ID', 'OBJECT_UID', 'EXECUTED_AT', 'SOURCE_ID', 'DATA', 'SKIN', 'LANGUAGE', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, )
BasePeer::TYPE_PHPNAME => array ('ChangeLogId', 'Date', 'AppNumber', 'DelIndex', 'ProId', 'TasId', 'UsrId', 'ObjectType', 'ObjectId', 'ObjectUid', 'ExecutedAt', 'SourceId', 'Data', 'Skin', 'Language', 'RowMigration', ),
BasePeer::TYPE_COLNAME => array (AppDataChangeLogPeer::CHANGE_LOG_ID, AppDataChangeLogPeer::DATE, AppDataChangeLogPeer::APP_NUMBER, AppDataChangeLogPeer::DEL_INDEX, AppDataChangeLogPeer::PRO_ID, AppDataChangeLogPeer::TAS_ID, AppDataChangeLogPeer::USR_ID, AppDataChangeLogPeer::OBJECT_TYPE, AppDataChangeLogPeer::OBJECT_ID, AppDataChangeLogPeer::OBJECT_UID, AppDataChangeLogPeer::EXECUTED_AT, AppDataChangeLogPeer::SOURCE_ID, AppDataChangeLogPeer::DATA, AppDataChangeLogPeer::SKIN, AppDataChangeLogPeer::LANGUAGE, AppDataChangeLogPeer::ROW_MIGRATION, ),
BasePeer::TYPE_FIELDNAME => array ('CHANGE_LOG_ID', 'DATE', 'APP_NUMBER', 'DEL_INDEX', 'PRO_ID', 'TAS_ID', 'USR_ID', 'OBJECT_TYPE', 'OBJECT_ID', 'OBJECT_UID', 'EXECUTED_AT', 'SOURCE_ID', 'DATA', 'SKIN', 'LANGUAGE', 'ROW_MIGRATION', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, )
);
/**
@@ -100,10 +103,10 @@ abstract class BaseAppDataChangeLogPeer
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
*/
private static $fieldKeys = array (
BasePeer::TYPE_PHPNAME => array ('ChangeLogId' => 0, 'Date' => 1, 'AppNumber' => 2, 'DelIndex' => 3, 'ProId' => 4, 'TasId' => 5, 'UsrId' => 6, 'ObjectType' => 7, 'ObjectId' => 8, 'ObjectUid' => 9, 'ExecutedAt' => 10, 'SourceId' => 11, 'Data' => 12, 'Skin' => 13, 'Language' => 14, ),
BasePeer::TYPE_COLNAME => array (AppDataChangeLogPeer::CHANGE_LOG_ID => 0, AppDataChangeLogPeer::DATE => 1, AppDataChangeLogPeer::APP_NUMBER => 2, AppDataChangeLogPeer::DEL_INDEX => 3, AppDataChangeLogPeer::PRO_ID => 4, AppDataChangeLogPeer::TAS_ID => 5, AppDataChangeLogPeer::USR_ID => 6, AppDataChangeLogPeer::OBJECT_TYPE => 7, AppDataChangeLogPeer::OBJECT_ID => 8, AppDataChangeLogPeer::OBJECT_UID => 9, AppDataChangeLogPeer::EXECUTED_AT => 10, AppDataChangeLogPeer::SOURCE_ID => 11, AppDataChangeLogPeer::DATA => 12, AppDataChangeLogPeer::SKIN => 13, AppDataChangeLogPeer::LANGUAGE => 14, ),
BasePeer::TYPE_FIELDNAME => array ('CHANGE_LOG_ID' => 0, 'DATE' => 1, 'APP_NUMBER' => 2, 'DEL_INDEX' => 3, 'PRO_ID' => 4, 'TAS_ID' => 5, 'USR_ID' => 6, 'OBJECT_TYPE' => 7, 'OBJECT_ID' => 8, 'OBJECT_UID' => 9, 'EXECUTED_AT' => 10, 'SOURCE_ID' => 11, 'DATA' => 12, 'SKIN' => 13, 'LANGUAGE' => 14, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, )
BasePeer::TYPE_PHPNAME => array ('ChangeLogId' => 0, 'Date' => 1, 'AppNumber' => 2, 'DelIndex' => 3, 'ProId' => 4, 'TasId' => 5, 'UsrId' => 6, 'ObjectType' => 7, 'ObjectId' => 8, 'ObjectUid' => 9, 'ExecutedAt' => 10, 'SourceId' => 11, 'Data' => 12, 'Skin' => 13, 'Language' => 14, 'RowMigration' => 15, ),
BasePeer::TYPE_COLNAME => array (AppDataChangeLogPeer::CHANGE_LOG_ID => 0, AppDataChangeLogPeer::DATE => 1, AppDataChangeLogPeer::APP_NUMBER => 2, AppDataChangeLogPeer::DEL_INDEX => 3, AppDataChangeLogPeer::PRO_ID => 4, AppDataChangeLogPeer::TAS_ID => 5, AppDataChangeLogPeer::USR_ID => 6, AppDataChangeLogPeer::OBJECT_TYPE => 7, AppDataChangeLogPeer::OBJECT_ID => 8, AppDataChangeLogPeer::OBJECT_UID => 9, AppDataChangeLogPeer::EXECUTED_AT => 10, AppDataChangeLogPeer::SOURCE_ID => 11, AppDataChangeLogPeer::DATA => 12, AppDataChangeLogPeer::SKIN => 13, AppDataChangeLogPeer::LANGUAGE => 14, AppDataChangeLogPeer::ROW_MIGRATION => 15, ),
BasePeer::TYPE_FIELDNAME => array ('CHANGE_LOG_ID' => 0, 'DATE' => 1, 'APP_NUMBER' => 2, 'DEL_INDEX' => 3, 'PRO_ID' => 4, 'TAS_ID' => 5, 'USR_ID' => 6, 'OBJECT_TYPE' => 7, 'OBJECT_ID' => 8, 'OBJECT_UID' => 9, 'EXECUTED_AT' => 10, 'SOURCE_ID' => 11, 'DATA' => 12, 'SKIN' => 13, 'LANGUAGE' => 14, 'ROW_MIGRATION' => 15, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, )
);
/**
@@ -234,6 +237,8 @@ abstract class BaseAppDataChangeLogPeer
$criteria->addSelectColumn(AppDataChangeLogPeer::LANGUAGE);
$criteria->addSelectColumn(AppDataChangeLogPeer::ROW_MIGRATION);
}
const COUNT = 'COUNT(APP_DATA_CHANGE_LOG.CHANGE_LOG_ID)';