Skip to content

Commit

Permalink
🔨 BASE #106 correções
Browse files Browse the repository at this point in the history
  • Loading branch information
bjverde committed Jul 9, 2020
1 parent 82787e3 commit 62ae87f
Showing 1 changed file with 28 additions and 143 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,7 @@

class TFormDinDaoDbms
{
private $host = null;
private $port = null;
private $name = null;
private $user = null;
private $pass = null;
private $type = null;
private $connection = null;
private $schema = null;
private $utf8 = null;
private $error = null;
Expand All @@ -70,41 +65,15 @@ class TFormDinDaoDbms
/**
* Classe para pegar metadatos sobre diversos banco de dados.
*
* @param [type] $tableName - 1: nome da tabela
* @param [type] $type - 2: Tipo de banco de dados conforme TFormDinPdoConnection
* @param [type] $user - 3:
* @param [type] $pass
* @param [type] $name
* @param [type] $host
* @param [type] $port
* @param [type] $strSchema
*/

/**
* @param string $strTableName
* @param string $strDbType
* @param string $strUsername
* @param string $strPassword
* @param string $strDatabase
* @param string $strHost
* @param string $strPort
* @param string $strSchema
* @param boolean$boolUtf8
* @param string $strCharset
* @param boolean $boolAutoCommit
* @param string $strMetadataDir
* @return object TDAO
*/


/**
* Undocumented function
*
* @param string $strTableName - 1: nome da tabela
* @param string $strDbType - 2: Tipo de banco de dados conforme TFormDinPdoConnection
* @param string $strUsername - 3:
* @param [type] $strPassword
* @param [type] $strDatabase
* @param [type] $strHost
* @param [type] $strPort
* @param [type] $strSchema
* @param [type] $boolUtf8
* @param [type] $strCharset
* @param [type] $boolAutoCommit
* @param [type] $strMetadataDir
*/
public function __construct( $tableName = null
, $type = null
, $user = null
Expand All @@ -116,68 +85,19 @@ public function __construct( $tableName = null
{
$this->setTableName( $tableName );
$this->setType($type);
$this->setUser($user);
$this->setPass($pass);
$this->setName($name);
$this->setHost($host);
$this->setPort($port);
$this->setSchema( $strSchema );
}


public function getHost()
{
return $this->host;
$connection = new TFormDinPdoConnection();
$connection->setType($type);
$connection->setUser($user);
$connection->setPass($pass);
$connection->setName($name);
$connection->setHost($host);
$connection->setPort($port);
$this->setConnection($connection);
}

/**
* Define o nome ou endereço IP do computador onde está instalado o banco de dados
*
* @param string $host
* @return void
*/
public function setHost($host)
{
$this->host = $host;
}

public function getPort()
{
return $this->port;
}
public function setPort($port)
{
$this->port = $port;
}

public function getName()
{
return $this->name;
}
public function setName($name)
{
$this->name = $name;
}

public function getUser()
{
return $this->user;
}
public function setUser($user)
{
$this->user = $user;
}

public function getPass()
{
return $this->pass;
}
public function setPass($pass)
{
$this->pass = $pass;
}

public function getType()
public function getType()
{
return $this->type;
}
Expand All @@ -199,6 +119,15 @@ public function setType($type)
$this->type = $type;
}

public function getConnection()
{
return $this->connection;
}
public function setConnection($connection)
{
$this->connection = $connection;
}

/**
* Define o nome do esquema dentro do banco de dados que deverã ser utilizado.
* Este método aplica somente ao banco de dados postgres
Expand Down Expand Up @@ -228,50 +157,6 @@ public function getSchema()
return $this->schema;
}

/**
* Tenta fazer a conexão com o banco de dados retornando verdadeiro o falso
*
* @return boolean
*/
public function connect() {
try {
if( ! $this->conn ){
$this->conn = TConnectionPool::connect( $this->getDbType()
, $this->getUsername()
, $this->getPassword()
, $this->getDatabase()
, $this->getHost()
, $this->getPort()
, $this->getSchema()
, $this->getUtf8() );
}
}
catch( Exception $e ) {
$this->setError( $e->getMessage() );
return false;
}

if( $this->getMetadataDir())
{
if ( !is_array( $this->getFields() ) )
{
if ( !$this->unserializeFields() )
{
$this->loadFieldsFromDatabase();
}
}
if( is_array($this->primaryKeys ) )
{
foreach($this->primaryKeys as $fieldName=>$boolTemp)
{
$this->getField($fieldName)->primaryKey = 1;
}
}
}

return true;
}

/**
* Executa o comando sql recebido retornando o cursor ou verdadeiro o falso se a operação
* foi bem sucedida.
Expand Down Expand Up @@ -1439,7 +1324,7 @@ public function loadTablesFromDatabase() {
default:
throw new DomainException('Database '.$DbType.' not implemented ! TDAO->loadTablesFromDatabase. Contribute to the project https://github.com/bjverde/sysgen !');
}
$result = $this->executeSql($sql);
$result = $this->getConnection()->executeSql($sql);
return $result;
}

Expand Down

0 comments on commit 62ae87f

Please sign in to comment.