|
|
@@ -101,8 +101,8 @@ class InstanceConfig {
|
|
|
$idInstance = $conf->id;
|
|
|
$dbName = DB::getPDO()->getDatabaseName();
|
|
|
$sqlIsInstanceView = self::generateIsInstanceView($objectItem['namespace'], $objectItem, $conf);
|
|
|
- DB::getPDO()->execSql(" DROP VIEW IF EXISTS `{$dbName}`.`CRM__#INSTANCE_TABLE__{$idInstance}_VIEW` ");
|
|
|
- DB::getPDO()->execSql(" CREATE VIEW `{$dbName}`.`CRM__#INSTANCE_TABLE__{$idInstance}_VIEW` AS {$sqlIsInstanceView} ");
|
|
|
+ $instanceViewTableName = "CRM__#INSTANCE_TABLE__{$idInstance}_VIEW";
|
|
|
+ DB::getPDO()->execSql(" CREATE OR REPLACE DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `{$dbName}`.`{$instanceViewTableName}` AS {$sqlIsInstanceView} ");
|
|
|
}
|
|
|
|
|
|
static function getRootNamespace($namespace) { // TODO: works only for relative urls! - mv to Acl->getRootNamespace
|
|
|
@@ -173,6 +173,10 @@ class InstanceConfig {
|
|
|
: DB::getPDO()->quote($option);
|
|
|
}, array_keys($xsdRestriction['enumeration']))) . ")";
|
|
|
}
|
|
|
+ if (array_key_exists('minInclusive', $xsdRestriction)) {
|
|
|
+ $minInclusive = (int)$xsdRestriction['minInclusive'];
|
|
|
+ $sqlRestrictions[] = "{$sqlTablePrefix}.`{$fieldName}` > {$minInclusive}";
|
|
|
+ }
|
|
|
}
|
|
|
return $sqlRestrictions;
|
|
|
}, array_keys($fieldsWithRestrictions), array_values($fieldsWithRestrictions)),
|