summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
Diffstat (limited to 'framework')
-rw-r--r--framework/Wsat/TWsatARGenerator.php22
-rw-r--r--framework/Wsat/pages/TWsatGenerateAR.page4
-rw-r--r--framework/Wsat/pages/TWsatGenerateAR.php20
3 files changed, 22 insertions, 24 deletions
diff --git a/framework/Wsat/TWsatARGenerator.php b/framework/Wsat/TWsatARGenerator.php
index d5b87a4f..2d4aeb12 100644
--- a/framework/Wsat/TWsatARGenerator.php
+++ b/framework/Wsat/TWsatARGenerator.php
@@ -27,17 +27,17 @@ class TWsatARGenerator
/**
* Output folder where AR classes will be generated.
*/
- private $_op_file;
+ private $_opFile;
/**
* Class name prefix
*/
- private $_clas_prefix;
+ private $_clasPrefix;
/**
* Class name sufix
*/
- private $_class_sufix;
+ private $_classSufix;
/**
* all table relations array
@@ -48,7 +48,7 @@ class TWsatARGenerator
* unquote chars
* @var array
*/
- private $uq_chars = array('[', ']', '"', '`', "'");
+ private $uqChars = array('[', ']', '"', '`', "'");
function __construct()
{
@@ -77,17 +77,17 @@ class TWsatARGenerator
throw new Exception("You need to fix your output folder namespace.");
if (!is_dir($op_file))
mkdir($op_file, 0777, true);
- $this->_op_file = $op_file;
+ $this->_opFile = $op_file;
}
public function setClasPrefix($_clas_prefix)
{
- $this->_clas_prefix = $_clas_prefix;
+ $this->_clasPrefix = $_clas_prefix;
}
public function setClassSufix($_clas_sufix)
{
- $this->_class_sufix = $_clas_sufix;
+ $this->_classSufix = $_clas_sufix;
}
//-----------------------------------------------------------------------------
@@ -185,7 +185,7 @@ class TWsatARGenerator
$clasName = $this->_getProperClassName($tableName);
$class = $this->generateClass($properties, $tableName, $clasName, $toString);
- $output = $this->_op_file . DIRECTORY_SEPARATOR . $clasName . ".php";
+ $output = $this->_opFile . DIRECTORY_SEPARATOR . $clasName . ".php";
file_put_contents($output, $class);
}
@@ -204,7 +204,7 @@ class TWsatARGenerator
{
$table_name_words = str_replace("_", " ", strtolower($tableName));
$final_conversion = str_replace(" ", "", ucwords($table_name_words));
- return $this->_clas_prefix . $final_conversion . $this->_class_sufix;
+ return $this->_clasPrefix . $final_conversion . $this->_classSufix;
}
public function renderAllTablesInformation()
@@ -258,10 +258,10 @@ class TWsatARGenerator
foreach ($tableInfo->getColumns() as $column)
{
if (isset($column->IsPrimaryKey) && $column->IsPrimaryKey)
- $property = str_replace($this->uq_chars, "", $column->ColumnName);
+ $property = str_replace($this->uqChars, "", $column->ColumnName);
elseif ($column->PHPType == "string" && $column->DBType != "date")
{
- $property = str_replace($this->uq_chars, "", $column->ColumnName);
+ $property = str_replace($this->uqChars, "", $column->ColumnName);
break;
}
}
diff --git a/framework/Wsat/pages/TWsatGenerateAR.page b/framework/Wsat/pages/TWsatGenerateAR.page
index b1cd98aa..926d6b0f 100644
--- a/framework/Wsat/pages/TWsatGenerateAR.page
+++ b/framework/Wsat/pages/TWsatGenerateAR.page
@@ -33,8 +33,8 @@
</div>
<div class="form_row">
- <com:TLabel Text="Class Sufix:" ForControl="class_sufix" style="margin-right: 27px"/>
- <com:TTextBox ID="class_sufix" CssClass="in_text" />
+ <com:TLabel Text="Class Suffix:" ForControl="class_suffix" style="margin-right: 27px"/>
+ <com:TTextBox ID="class_suffix" CssClass="in_text" />
</div>
<div class="form_row">
diff --git a/framework/Wsat/pages/TWsatGenerateAR.php b/framework/Wsat/pages/TWsatGenerateAR.php
index c9584038..2c85445d 100644
--- a/framework/Wsat/pages/TWsatGenerateAR.php
+++ b/framework/Wsat/pages/TWsatGenerateAR.php
@@ -18,23 +18,23 @@ class TWsatGenerateAR extends TPage
{
if ($this->IsValid)
{
- $table_name = $this->table_name->Text;
- $output_folder_ns = $this->output_folder->Text;
- $class_prefix = $this->class_prefix->Text;
- $class_sufix = $this->class_sufix->Text;
+ $tableName = $this->table_name->Text;
+ $outputFolderNs = $this->output_folder->Text;
+ $classPrefix = $this->class_prefix->Text;
+ $classSuffix = $this->class_suffix->Text;
try
{
$ar_generator = new TWsatARGenerator();
- $ar_generator->setOpFile($output_folder_ns);
- $ar_generator->setClasPrefix($class_prefix);
- $ar_generator->setClassSufix($class_sufix);
+ $ar_generator->setOpFile($outputFolderNs);
+ $ar_generator->setClasPrefix($classPrefix);
+ $ar_generator->setClassSufix($classSuffix);
if ($this->build_rel->Checked)
$ar_generator->buildRelations();
- if ($table_name != "*")
- $ar_generator->generate($table_name);
+ if ($tableName != "*")
+ $ar_generator->generate($tableName);
else
$ar_generator->generateAll();
@@ -51,8 +51,6 @@ class TWsatGenerateAR extends TPage
public function preview($sender)
{
-// $ar_generator = new TWsatARGenerator();
-// $ar_generator->renderAllTablesInformation();
throw new THttpException(500, "Not implemented yet.");
}