summaryrefslogtreecommitdiff
path: root/framework/Data/ActiveRecord
diff options
context:
space:
mode:
authorDavid <ottodavid@gmx.net>2015-08-08 22:48:07 +0200
committerDavid <ottodavid@gmx.net>2015-08-09 09:44:04 +0200
commit92ee7558c6b6dd2461b645cb1f19a81ef8c50db5 (patch)
treec0cad47bd972c6b2c2b38fb144a417268e1bbd5a /framework/Data/ActiveRecord
parent835e3f8c3a68b5a4577b0e1784f0e8eb1724a525 (diff)
Removed redundand Prado::using statements
Diffstat (limited to 'framework/Data/ActiveRecord')
-rw-r--r--framework/Data/ActiveRecord/Relations/TActiveRecordBelongsTo.php1
-rw-r--r--framework/Data/ActiveRecord/Relations/TActiveRecordHasMany.php1
-rw-r--r--framework/Data/ActiveRecord/Relations/TActiveRecordHasManyAssociation.php1
-rw-r--r--framework/Data/ActiveRecord/Relations/TActiveRecordHasOne.php1
-rw-r--r--framework/Data/ActiveRecord/Relations/TActiveRecordRelation.php1
-rw-r--r--framework/Data/ActiveRecord/Relations/TActiveRecordRelationContext.php4
-rw-r--r--framework/Data/ActiveRecord/Scaffold/InputBuilder/TIbmScaffoldInput.php1
-rw-r--r--framework/Data/ActiveRecord/Scaffold/InputBuilder/TMssqlScaffoldInput.php1
-rw-r--r--framework/Data/ActiveRecord/Scaffold/InputBuilder/TMysqlScaffoldInput.php1
-rw-r--r--framework/Data/ActiveRecord/Scaffold/InputBuilder/TPgsqlScaffoldInput.php1
-rw-r--r--framework/Data/ActiveRecord/Scaffold/InputBuilder/TScaffoldInputCommon.php1
-rw-r--r--framework/Data/ActiveRecord/Scaffold/InputBuilder/TSqliteScaffoldInput.php1
-rw-r--r--framework/Data/ActiveRecord/Scaffold/TScaffoldBase.php1
-rw-r--r--framework/Data/ActiveRecord/Scaffold/TScaffoldEditView.php2
-rw-r--r--framework/Data/ActiveRecord/Scaffold/TScaffoldListView.php1
-rw-r--r--framework/Data/ActiveRecord/Scaffold/TScaffoldSearch.php1
-rw-r--r--framework/Data/ActiveRecord/Scaffold/TScaffoldView.php4
-rw-r--r--framework/Data/ActiveRecord/TActiveRecord.php3
-rw-r--r--framework/Data/ActiveRecord/TActiveRecordConfig.php2
-rw-r--r--framework/Data/ActiveRecord/TActiveRecordCriteria.php1
-rw-r--r--framework/Data/ActiveRecord/TActiveRecordGateway.php2
-rw-r--r--framework/Data/ActiveRecord/TActiveRecordManager.php4
22 files changed, 0 insertions, 36 deletions
diff --git a/framework/Data/ActiveRecord/Relations/TActiveRecordBelongsTo.php b/framework/Data/ActiveRecord/Relations/TActiveRecordBelongsTo.php
index 3ff2d196..55a09baa 100644
--- a/framework/Data/ActiveRecord/Relations/TActiveRecordBelongsTo.php
+++ b/framework/Data/ActiveRecord/Relations/TActiveRecordBelongsTo.php
@@ -17,7 +17,6 @@ namespace Prado\Data\ActiveRecord\Relations;
use Prado\Data\ActiveRecord\Exceptions\TActiveRecordException;
use Prado\Prado;
-Prado::using('System.Data.ActiveRecord.Relations.TActiveRecordRelation');
/**
* Implements the foreign key relationship (TActiveRecord::BELONGS_TO) between
diff --git a/framework/Data/ActiveRecord/Relations/TActiveRecordHasMany.php b/framework/Data/ActiveRecord/Relations/TActiveRecordHasMany.php
index 06c14950..8b93fcee 100644
--- a/framework/Data/ActiveRecord/Relations/TActiveRecordHasMany.php
+++ b/framework/Data/ActiveRecord/Relations/TActiveRecordHasMany.php
@@ -16,7 +16,6 @@ namespace Prado\Data\ActiveRecord\Relations;
*/
use Prado\Prado;
-Prado::using('System.Data.ActiveRecord.Relations.TActiveRecordRelation');
/**
* Implements TActiveRecord::HAS_MANY relationship between the source object having zero or
diff --git a/framework/Data/ActiveRecord/Relations/TActiveRecordHasManyAssociation.php b/framework/Data/ActiveRecord/Relations/TActiveRecordHasManyAssociation.php
index f5d644be..2632fa83 100644
--- a/framework/Data/ActiveRecord/Relations/TActiveRecordHasManyAssociation.php
+++ b/framework/Data/ActiveRecord/Relations/TActiveRecordHasManyAssociation.php
@@ -17,7 +17,6 @@ namespace Prado\Data\ActiveRecord\Relations;
use Prado\Data\ActiveRecord\TActiveRecord;
use Prado\Prado;
-Prado::using('System.Data.ActiveRecord.Relations.TActiveRecordRelation');
/**
* Implements the M-N (many to many) relationship via association table.
diff --git a/framework/Data/ActiveRecord/Relations/TActiveRecordHasOne.php b/framework/Data/ActiveRecord/Relations/TActiveRecordHasOne.php
index 320cfc32..b0787f3a 100644
--- a/framework/Data/ActiveRecord/Relations/TActiveRecordHasOne.php
+++ b/framework/Data/ActiveRecord/Relations/TActiveRecordHasOne.php
@@ -17,7 +17,6 @@ namespace Prado\Data\ActiveRecord\Relations;
use Prado\Data\ActiveRecord\Exceptions\TActiveRecordException;
use Prado\Prado;
-Prado::using('System.Data.ActiveRecord.Relations.TActiveRecordRelation');
/**
* TActiveRecordHasOne models the object relationship that a record (the source object)
diff --git a/framework/Data/ActiveRecord/Relations/TActiveRecordRelation.php b/framework/Data/ActiveRecord/Relations/TActiveRecordRelation.php
index d7f6d0a7..d9a0e9e2 100644
--- a/framework/Data/ActiveRecord/Relations/TActiveRecordRelation.php
+++ b/framework/Data/ActiveRecord/Relations/TActiveRecordRelation.php
@@ -18,7 +18,6 @@ use Prado\Data\ActiveRecord\Exceptions\TActiveRecordException;
use Prado\Data\ActiveRecord\TActiveRecord;
use Prado\Prado;
-Prado::using('System.Data.ActiveRecord.Relations.TActiveRecordRelationContext');
/**
* Base class for active record relationships.
diff --git a/framework/Data/ActiveRecord/Relations/TActiveRecordRelationContext.php b/framework/Data/ActiveRecord/Relations/TActiveRecordRelationContext.php
index 2af4ec7d..d3833d69 100644
--- a/framework/Data/ActiveRecord/Relations/TActiveRecordRelationContext.php
+++ b/framework/Data/ActiveRecord/Relations/TActiveRecordRelationContext.php
@@ -183,16 +183,12 @@ class TActiveRecordRelationContext
switch($this->getRelationType())
{
case TActiveRecord::HAS_MANY:
- Prado::using('System.Data.ActiveRecord.Relations.TActiveRecordHasMany');
return new TActiveRecordHasMany($this, $criteria);
case TActiveRecord::MANY_TO_MANY:
- Prado::using('System.Data.ActiveRecord.Relations.TActiveRecordHasManyAssociation');
return new TActiveRecordHasManyAssociation($this, $criteria);
case TActiveRecord::HAS_ONE:
- Prado::using('System.Data.ActiveRecord.Relations.TActiveRecordHasOne');
return new TActiveRecordHasOne($this, $criteria);
case TActiveRecord::BELONGS_TO:
- Prado::using('System.Data.ActiveRecord.Relations.TActiveRecordBelongsTo');
return new TActiveRecordBelongsTo($this, $criteria);
default:
throw new TActiveRecordException('ar_invalid_relationship');
diff --git a/framework/Data/ActiveRecord/Scaffold/InputBuilder/TIbmScaffoldInput.php b/framework/Data/ActiveRecord/Scaffold/InputBuilder/TIbmScaffoldInput.php
index 7c55fa14..76344e65 100644
--- a/framework/Data/ActiveRecord/Scaffold/InputBuilder/TIbmScaffoldInput.php
+++ b/framework/Data/ActiveRecord/Scaffold/InputBuilder/TIbmScaffoldInput.php
@@ -13,7 +13,6 @@ namespace Prado\Data\ActiveRecord\Scaffold\InputBuilder;
use Prado\Prado;
-Prado::using('System.Data.ActiveRecord.Scaffold.InputBuilder.TScaffoldInputCommon');
class TIbmScaffoldInput extends TScaffoldInputCommon
{
diff --git a/framework/Data/ActiveRecord/Scaffold/InputBuilder/TMssqlScaffoldInput.php b/framework/Data/ActiveRecord/Scaffold/InputBuilder/TMssqlScaffoldInput.php
index 41c50dad..8807840c 100644
--- a/framework/Data/ActiveRecord/Scaffold/InputBuilder/TMssqlScaffoldInput.php
+++ b/framework/Data/ActiveRecord/Scaffold/InputBuilder/TMssqlScaffoldInput.php
@@ -12,7 +12,6 @@ namespace Prado\Data\ActiveRecord\Scaffold\InputBuilder;
use Prado\Prado;
-Prado::using('System.Data.ActiveRecord.Scaffold.InputBuilder.TScaffoldInputCommon');
class TMssqlScaffoldInput extends TScaffoldInputCommon
{
diff --git a/framework/Data/ActiveRecord/Scaffold/InputBuilder/TMysqlScaffoldInput.php b/framework/Data/ActiveRecord/Scaffold/InputBuilder/TMysqlScaffoldInput.php
index cd27fbab..decc1956 100644
--- a/framework/Data/ActiveRecord/Scaffold/InputBuilder/TMysqlScaffoldInput.php
+++ b/framework/Data/ActiveRecord/Scaffold/InputBuilder/TMysqlScaffoldInput.php
@@ -12,7 +12,6 @@ namespace Prado\Data\ActiveRecord\Scaffold\InputBuilder;
use Prado\Prado;
-Prado::using('System.Data.ActiveRecord.Scaffold.InputBuilder.TScaffoldInputCommon');
class TMysqlScaffoldInput extends TScaffoldInputCommon
{
diff --git a/framework/Data/ActiveRecord/Scaffold/InputBuilder/TPgsqlScaffoldInput.php b/framework/Data/ActiveRecord/Scaffold/InputBuilder/TPgsqlScaffoldInput.php
index 46da92e8..2575ab85 100644
--- a/framework/Data/ActiveRecord/Scaffold/InputBuilder/TPgsqlScaffoldInput.php
+++ b/framework/Data/ActiveRecord/Scaffold/InputBuilder/TPgsqlScaffoldInput.php
@@ -12,7 +12,6 @@ namespace Prado\Data\ActiveRecord\Scaffold\InputBuilder;
use Prado\Prado;
-Prado::using('System.Data.ActiveRecord.Scaffold.InputBuilder.TScaffoldInputCommon');
class TPgsqlScaffoldInput extends TScaffoldInputCommon
{
diff --git a/framework/Data/ActiveRecord/Scaffold/InputBuilder/TScaffoldInputCommon.php b/framework/Data/ActiveRecord/Scaffold/InputBuilder/TScaffoldInputCommon.php
index f366d5eb..f538b10e 100644
--- a/framework/Data/ActiveRecord/Scaffold/InputBuilder/TScaffoldInputCommon.php
+++ b/framework/Data/ActiveRecord/Scaffold/InputBuilder/TScaffoldInputCommon.php
@@ -27,7 +27,6 @@ use Prado\Web\UI\WebControls\TTextBoxMode;
use Prado\Web\UI\WebControls\TValidationDataType;
use Prado\Web\UI\WebControls\TValidatorDisplayStyle;
-Prado::using('System.Data.ActiveRecord.Scaffold.InputBuilder.TScaffoldInputBase');
class TScaffoldInputCommon extends TScaffoldInputBase
{
diff --git a/framework/Data/ActiveRecord/Scaffold/InputBuilder/TSqliteScaffoldInput.php b/framework/Data/ActiveRecord/Scaffold/InputBuilder/TSqliteScaffoldInput.php
index 38e37a18..04fe7457 100644
--- a/framework/Data/ActiveRecord/Scaffold/InputBuilder/TSqliteScaffoldInput.php
+++ b/framework/Data/ActiveRecord/Scaffold/InputBuilder/TSqliteScaffoldInput.php
@@ -12,7 +12,6 @@ namespace Prado\Data\ActiveRecord\Scaffold\InputBuilder;
use Prado\Prado;
-Prado::using('System.Data.ActiveRecord.Scaffold.InputBuilder.TScaffoldInputCommon');
class TSqliteScaffoldInput extends TScaffoldInputCommon
{
diff --git a/framework/Data/ActiveRecord/Scaffold/TScaffoldBase.php b/framework/Data/ActiveRecord/Scaffold/TScaffoldBase.php
index 8e044606..b67390b2 100644
--- a/framework/Data/ActiveRecord/Scaffold/TScaffoldBase.php
+++ b/framework/Data/ActiveRecord/Scaffold/TScaffoldBase.php
@@ -20,7 +20,6 @@ use Prado\Prado;
use Prado\TPropertyValue;
use Prado\Web\UI\TTemplateControl;
-Prado::using('System.Data.ActiveRecord.TActiveRecord');
/**
* Base class for Active Record scaffold views.
diff --git a/framework/Data/ActiveRecord/Scaffold/TScaffoldEditView.php b/framework/Data/ActiveRecord/Scaffold/TScaffoldEditView.php
index df251efa..2eecf908 100644
--- a/framework/Data/ActiveRecord/Scaffold/TScaffoldEditView.php
+++ b/framework/Data/ActiveRecord/Scaffold/TScaffoldEditView.php
@@ -20,7 +20,6 @@ use Prado\Prado;
use Prado\TPropertyValue;
use Prado\Web\UI\WebControls\TListItemType;
-Prado::using('System.Data.ActiveRecord.Scaffold.TScaffoldBase');
/**
* Template control for editing an Active Record instance.
@@ -276,7 +275,6 @@ class TScaffoldEditView extends TScaffoldBase
$class = get_class($record);
if(!isset($_builders[$class]))
{
- Prado::using('System.Data.ActiveRecord.Scaffold.InputBuilder.TScaffoldInputBase');
$_builders[$class] = TScaffoldInputBase::createInputBuilder($record);
}
return $_builders[$class];
diff --git a/framework/Data/ActiveRecord/Scaffold/TScaffoldListView.php b/framework/Data/ActiveRecord/Scaffold/TScaffoldListView.php
index e7e5ab9c..0303337e 100644
--- a/framework/Data/ActiveRecord/Scaffold/TScaffoldListView.php
+++ b/framework/Data/ActiveRecord/Scaffold/TScaffoldListView.php
@@ -22,7 +22,6 @@ use Prado\Web\UI\WebControls\IItemDataRenderer;
use Prado\Web\UI\WebControls\TListItemType;
use Prado\Web\UI\WebControls\TRepeaterCommandEventParameter;
-Prado::using('System.Data.ActiveRecord.Scaffold.TScaffoldBase');
/**
* TScaffoldListView displays a list of Active Records.
diff --git a/framework/Data/ActiveRecord/Scaffold/TScaffoldSearch.php b/framework/Data/ActiveRecord/Scaffold/TScaffoldSearch.php
index 26b8e0b5..b7eb5c80 100644
--- a/framework/Data/ActiveRecord/Scaffold/TScaffoldSearch.php
+++ b/framework/Data/ActiveRecord/Scaffold/TScaffoldSearch.php
@@ -17,7 +17,6 @@ namespace Prado\Data\ActiveRecord\Scaffold;
use Prado\Exceptions\TConfigurationException;
use Prado\Prado;
-Prado::using('System.Data.ActiveRecord.Scaffold.TScaffoldBase');
/**
* TScaffoldSearch provide a simple textbox and a button that is used
diff --git a/framework/Data/ActiveRecord/Scaffold/TScaffoldView.php b/framework/Data/ActiveRecord/Scaffold/TScaffoldView.php
index 27adb544..32b3f233 100644
--- a/framework/Data/ActiveRecord/Scaffold/TScaffoldView.php
+++ b/framework/Data/ActiveRecord/Scaffold/TScaffoldView.php
@@ -16,10 +16,6 @@ namespace Prado\Data\ActiveRecord\Scaffold;
*/
use Prado\Prado;
-Prado::using('System.Data.ActiveRecord.Scaffold.TScaffoldBase');
-Prado::using('System.Data.ActiveRecord.Scaffold.TScaffoldListView');
-Prado::using('System.Data.ActiveRecord.Scaffold.TScaffoldEditView');
-Prado::using('System.Data.ActiveRecord.Scaffold.TScaffoldSearch');
/**
* TScaffoldView is a composite control consisting of TScaffoldListView
diff --git a/framework/Data/ActiveRecord/TActiveRecord.php b/framework/Data/ActiveRecord/TActiveRecord.php
index 27c51fcd..38f8ef29 100644
--- a/framework/Data/ActiveRecord/TActiveRecord.php
+++ b/framework/Data/ActiveRecord/TActiveRecord.php
@@ -21,9 +21,6 @@ use Prado\Prado;
use Prado\TPropertyValue;
use ReflectionClass;
-Prado::using('System.Data.ActiveRecord.TActiveRecordManager');
-Prado::using('System.Data.ActiveRecord.TActiveRecordCriteria');
-Prado::using('System.Data.ActiveRecord.Relations.TActiveRecordRelationContext');
/**
* Base class for active records.
diff --git a/framework/Data/ActiveRecord/TActiveRecordConfig.php b/framework/Data/ActiveRecord/TActiveRecordConfig.php
index 3975032a..fc9b5f89 100644
--- a/framework/Data/ActiveRecord/TActiveRecordConfig.php
+++ b/framework/Data/ActiveRecord/TActiveRecordConfig.php
@@ -15,8 +15,6 @@ use Prado\Data\TDataSourceConfig;
use Prado\Prado;
use Prado\TPropertyValue;
-Prado::using('System.Data.TDataSourceConfig');
-Prado::using('System.Data.ActiveRecord.TActiveRecordManager');
/**
* TActiveRecordConfig module configuration class.
diff --git a/framework/Data/ActiveRecord/TActiveRecordCriteria.php b/framework/Data/ActiveRecord/TActiveRecordCriteria.php
index 74b71511..00e36380 100644
--- a/framework/Data/ActiveRecord/TActiveRecordCriteria.php
+++ b/framework/Data/ActiveRecord/TActiveRecordCriteria.php
@@ -14,7 +14,6 @@ namespace Prado\Data\ActiveRecord;
use Prado\Data\DataGateway\TSqlCriteria;
use Prado\Prado;
-Prado::using('System.Data.DataGateway.TSqlCriteria');
/**
* Search criteria for Active Record.
diff --git a/framework/Data/ActiveRecord/TActiveRecordGateway.php b/framework/Data/ActiveRecord/TActiveRecordGateway.php
index 2c231f80..e70adceb 100644
--- a/framework/Data/ActiveRecord/TActiveRecordGateway.php
+++ b/framework/Data/ActiveRecord/TActiveRecordGateway.php
@@ -118,7 +118,6 @@ class TActiveRecordGateway extends \Prado\TComponent
//will find the correct driver dependent classes.
if(!isset($this->_meta[$connStr]))
{
- Prado::using('System.Data.Common.TDbMetaData');
$this->_meta[$connStr] = TDbMetaData::getInstance($connection);
}
@@ -148,7 +147,6 @@ class TActiveRecordGateway extends \Prado\TComponent
if(!isset($this->_commandBuilders[$connStr]))
{
$builder = $tableInfo->createCommandBuilder($record->getDbConnection());
- Prado::using('System.Data.DataGateway.TDataGatewayCommand');
$command = new TDataGatewayCommand($builder);
$command->OnCreateCommand[] = array($this, 'onCreateCommand');
$command->OnExecuteCommand[] = array($this, 'onExecuteCommand');
diff --git a/framework/Data/ActiveRecord/TActiveRecordManager.php b/framework/Data/ActiveRecord/TActiveRecordManager.php
index 3c21f432..11ffa047 100644
--- a/framework/Data/ActiveRecord/TActiveRecordManager.php
+++ b/framework/Data/ActiveRecord/TActiveRecordManager.php
@@ -14,10 +14,6 @@ namespace Prado\Data\ActiveRecord;
use Prado\Prado;
use Prado\TPropertyValue;
-Prado::using('System.Data.TDbConnection');
-Prado::using('System.Data.ActiveRecord.TActiveRecord');
-Prado::using('System.Data.ActiveRecord.Exceptions.TActiveRecordException');
-Prado::using('System.Data.ActiveRecord.TActiveRecordGateway');
/**
* TActiveRecordManager provides the default DB connection,