Skip to content

Commit b224a62

Browse files
committed
Fixing paths
1 parent e5eda60 commit b224a62

File tree

5 files changed

+23
-17
lines changed

5 files changed

+23
-17
lines changed

src/Mouf/Database/QueryWriter/Column.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<?php
22
namespace Mouf\Database\QueryWriter;
33

4+
use Mouf\Database\DBConnection\ConnectionInterface;
5+
46
/**
57
* The Column class represents one or many columns to be retrieved in a SQL Select statement
68
*
@@ -52,7 +54,7 @@ public function __construct($tableName = null, $columnName = null, $alias = null
5254
* (non-PHPdoc)
5355
* @see Mouf\Database\QueryWriter.SqlRenderInterface::toSql()
5456
*/
55-
public function toSql(\DB_ConnectionInterface $dbConnection) {
57+
public function toSql(ConnectionInterface $dbConnection) {
5658
$sql = "";
5759
if ($this->tableName) {
5860
$sql .= $dbConnection->escapeDBItem($this->tableName).".";

src/Mouf/Database/QueryWriter/Join.php

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<?php
22
namespace Mouf\Database\QueryWriter;
33

4+
use Mouf\Database\DBConnection\ConnectionInterface;
5+
46
/**
57
* Represents a LEFT JOIN, JOIN, RIGHT JOIN or OUTER JOIN in a SELECT query.
68
*
@@ -11,35 +13,31 @@ class Join implements TableReferenceInterface {
1113
/**
1214
* The left table in the join
1315
*
14-
* @Property
15-
* @Compulsory
16+
* @Important
1617
* @var TableReferenceInterface
1718
*/
1819
public $left;
1920

2021
/**
2122
* The right table in the join
2223
*
23-
* @Property
24-
* @Compulsory
24+
* @Important
2525
* @var TableReferenceInterface
2626
*/
2727
public $right;
2828

2929
/**
3030
* The ON condition.
3131
*
32-
* @Property
33-
* @Compulsory
34-
* @var filters\FilterInterface
32+
* @Important
33+
* @var Filters\FilterInterface
3534
*/
3635
public $on;
3736

3837
/**
3938
* The kind of Join to apply
4039
*
41-
* @Property
42-
* @Compulsory
40+
* @Important
4341
* @OneOf ("LEFT JOIN", "JOIN", "RIGHT JOIN", "OUTER JOIN")
4442
* @var string
4543
*/
@@ -49,7 +47,7 @@ class Join implements TableReferenceInterface {
4947
* (non-PHPdoc)
5048
* @see Mouf\Database\QueryWriter.SqlRenderInterface::toSql()
5149
*/
52-
public function toSql(\DB_ConnectionInterface $dbConnection) {
50+
public function toSql(ConnectionInterface $dbConnection) {
5351
$sql = "(".$this->left->toSql($dbConnection);
5452
$sql .= " ".$this->joinType." ";
5553
$sql .= $this->right->toSql($dbConnection);

src/Mouf/Database/QueryWriter/Select.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<?php
22
namespace Mouf\Database\QueryWriter;
33

4+
use Mouf\Database\DBConnection\ConnectionInterface;
5+
46
/**
57
* The Select class represents a SQL Select statement
68
*
@@ -14,7 +16,7 @@ class Select {
1416
*
1517
* @Property
1618
* @Compulsory
17-
* @var \DB_ConnectionInterface
19+
* @var ConnectionInterface
1820
*/
1921
public $connection;
2022

@@ -49,7 +51,7 @@ class Select {
4951
* The where condition.
5052
*
5153
* @Property
52-
* @var filters\FilterInterface
54+
* @var Filters\FilterInterface
5355
*/
5456
public $where;
5557

@@ -65,7 +67,7 @@ class Select {
6567
* The having condition.
6668
*
6769
* @Property
68-
* @var filters\FilterInterface
70+
* @var Filters\FilterInterface
6971
*/
7072
public $having;
7173

src/Mouf/Database/QueryWriter/SqlRenderInterface.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<?php
22
namespace Mouf\Database\QueryWriter;
33

4+
use Mouf\Database\DBConnection\ConnectionInterface;
5+
46
/**
57
* Objects implementing SqlRenderInterface can be rendered with the toSql method.
68
*
@@ -11,8 +13,8 @@ interface SqlRenderInterface {
1113
/**
1214
* Renders the object as a SQL string
1315
*
14-
* @param \DB_ConnectionInterface $dbConnection
16+
* @param ConnectionInterface $dbConnection
1517
* @return string
1618
*/
17-
public function toSql(\DB_ConnectionInterface $dbConnection);
19+
public function toSql(ConnectionInterface $dbConnection);
1820
}

src/Mouf/Database/QueryWriter/TableReference.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<?php
22
namespace Mouf\Database\QueryWriter;
33

4+
use Mouf\Database\DBConnection\ConnectionInterface;
5+
46
/**
57
* Represents a SQL table in a SELECT query.
68
*
@@ -32,7 +34,7 @@ class TableReference implements TableReferenceInterface {
3234
* Renders the object as a SQL string
3335
* @return string
3436
*/
35-
public function toSql(\DB_ConnectionInterface $dbConnection) {
37+
public function toSql(ConnectionInterface $dbConnection) {
3638
$sql = $dbConnection->escapeDBItem($this->tableName);
3739
if ($this->alias) {
3840
$sql .= " AS ".$dbConnection->escapeDBItem($this->alias);

0 commit comments

Comments
 (0)