Skip to content

Preserve eloquent positional parameters #60

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Preserve eloquent positional parameters #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
80578b6
Merge pull request #1 from BakoBako/allow-eloquent-builder-execution
bakome Jan 10, 2017
318117b
Merge branch 'master' of github.com:BakoBako/rulerz
Jan 25, 2017
c6bea99
Preserve eloquent positional parameters
Jan 25, 2017
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
22 changes: 19 additions & 3 deletions src/Target/Eloquent/Eloquent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,24 @@ class Eloquent extends AbstractSqlTarget
*/
protected $allowEloquentBuilderAsQuery = false;

/**
* Preserve positional parameters.
*
* @var bool
*/
protected $preservePositionalParameters = false;

/**
* @param bool $allowEloquentBuilderAsQuery Whether to allow the execution target to be eloquent builder instead of query builder.
*/
public function __construct($allowEloquentBuilderAsQuery = false)
{
public function __construct(
$allowEloquentBuilderAsQuery = false,
$preservePositionalParameters = false
) {
parent::__construct();

$this->allowEloquentBuilderAsQuery = (bool) $allowEloquentBuilderAsQuery;
$this->preservePositionalParameters = (bool) $preservePositionalParameters;
}

/**
Expand All @@ -51,6 +61,12 @@ protected function getExecutorTraits()
*/
protected function createVisitor(Context $context)
{
return new EloquentVisitor($context, $this->getOperators(), $this->allowStarOperator, $this->allowEloquentBuilderAsQuery);
return new EloquentVisitor(
$context,
$this->getOperators(),
$this->allowStarOperator,
$this->allowEloquentBuilderAsQuery,
$this->preservePositionalParameters
);
}
}
29 changes: 27 additions & 2 deletions src/Target/Eloquent/EloquentVisitor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace RulerZ\Target\Eloquent;

use RulerZ\Model;
use RulerZ\Compiler\Context;
use RulerZ\Target\GenericSqlVisitor;
use RulerZ\Target\Operators\Definitions as OperatorsDefinitions;
Expand All @@ -15,11 +16,35 @@ class EloquentVisitor extends GenericSqlVisitor
*/
protected $allowEloquentBuilderAsQuery = false;

public function __construct(Context $context, OperatorsDefinitions $operators, $allowStarOperator = true, $allowEloquentBuilderAsQuery = false)
{
/**
* Preserve positional parameters.
*
* @var bool
*/
protected $preservePositionalParameters = false;

/**
* @param bool $allowEloquentBuilderAsQuery Whether to allow the execution target to be eloquent builder instead of query builder.
*/
public function __construct(
Context $context,
OperatorsDefinitions $operators,
$allowStarOperator = true,
$allowEloquentBuilderAsQuery = false,
$preservePositionalParameters = false
) {
parent::__construct($context, $operators, $allowStarOperator);

$this->allowEloquentBuilderAsQuery = (bool) $allowEloquentBuilderAsQuery;
$this->preservePositionalParameters = (bool) $preservePositionalParameters;
}

/**
* {@inheritdoc}
*/
public function visitParameter(Model\Parameter $element, &$handle = null, $eldnah = null)
{
return $this->preservePositionalParameters ? '?' : ':'.$element->getName();
}

/**
Expand Down