Merge pull request #2174 from Jennydmz/BUG-13425

BUG-13425 Cambiar el tamanio del campo PASSWORD, tabla AUTHENTICATION_SOURCE en la bd RBAC.
This commit is contained in:
julceslauhub
2013-11-29 05:45:40 -08:00
2 changed files with 5 additions and 5 deletions

View File

@@ -108,7 +108,7 @@
<column name="SYS_UPDATE_DATE" type="TIMESTAMP" />
<column name="SYS_STATUS" type="INTEGER" required="true" default="0" />
</table>
<table name="RBAC_USERS">
<table name="USERS">
<vendor type="mysql">
<parameter name="Name" value="USERS"/>
<parameter name="Engine" value="MyISAM"/>

View File

@@ -345,12 +345,12 @@ class workspaceTools
*/
private function getDatabase($rbac = false)
{
if (isset($this->db) && $this->db->isConnected()) {
if (isset($this->db) && $this->db->isConnected() && $rbac == false) {
return $this->db;
}
G::LoadSystem('database_' . strtolower($this->dbAdapter));
if ($rbac = true){
if ($rbac == true){
$this->db = new database($this->dbAdapter, $this->dbRbacHost, $this->dbRbacUser, $this->dbRbacPass, $this->dbRbacName);
} else {
$this->db = new database($this->dbAdapter, $this->dbHost, $this->dbUser, $this->dbPass, $this->dbName);
@@ -390,7 +390,7 @@ class workspaceTools
*/
public function getSchema($rbac = false)
{
$oDataBase = $this->getDatabase($rbac);
$oDataBase = $this->getDatabase($rbac);
$aOldSchema = array();
@@ -674,7 +674,7 @@ class workspaceTools
throw new Exception("Only MySQL is supported");
}
$workspaceSchema = $this->getSchema($rbac);
$workspaceSchema = $this->getSchema($rbac);
$changes = System::compareSchema($workspaceSchema, $schema);