Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix/column names from subquery #1714

Merged
merged 3 commits into from
Apr 22, 2021
Merged

Bugfix/column names from subquery #1714

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d3612a0
merged tests for name replacement
mringler Mar 12, 2021
bc66b6c
bugfix: keep alias from subquery
mringler Mar 12, 2021
2c52635
removed small semantic mistakes
mringler Mar 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
removed small semantic mistakes
  • Loading branch information
@mringler
mringler committed Mar 12, 2021
commit 2c5263544d5f1b47fd1f0b91871d7e0cf885ee2d
10 changes: 0 additions & 10 deletions phpstan-baseline.neon
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions src/Propel/Runtime/ActiveQuery/BaseModelCriteria.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,7 @@ class BaseModelCriteria extends Criteria implements IteratorAggregate
*/
public function __construct($dbName = null, $modelName = null, $modelAlias = null)
{
$this->setDbName($dbName);
$this->originalDbName = $dbName;
parent::__construct($dbName);
mringler marked this conversation as resolved.
Show resolved Hide resolved
$this->setModelName($modelName);
$this->modelAlias = $modelAlias;
}
Expand Down
12 changes: 12 additions & 0 deletions src/Propel/Runtime/ActiveQuery/Criteria.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,18 @@ class Criteria
*/
public $replacedColumns = [];

/**
* temporary property used in replaceNames
*
* @var string|null
*/
protected $currentAlias;

/**
* @var bool
*/
protected $foundMatch = false;

mringler marked this conversation as resolved.
Show resolved Hide resolved
/**
* Creates a new instance with the default capacity which corresponds to
* the specified database.
Expand Down
12 changes: 0 additions & 12 deletions src/Propel/Runtime/ActiveQuery/ModelCriteria.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,18 +92,6 @@ class ModelCriteria extends BaseModelCriteria
*/
protected $select;

/**
* temporary property used in replaceNames
*
* @var string|null
*/
protected $currentAlias;

/**
* @var bool
*/
protected $foundMatch = false;

/**
* Used to memorize whether we added self-select columns before.
*
Expand Down