Skip to content
Snippets Groups Projects
Commit 3e473bfc authored by Demian Katz's avatar Demian Katz Committed by Robert Lange
Browse files

Use SQL_STAR constant for clarity. (#1690)

parent 444569e3
Branches
Tags
No related merge requests found
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
namespace VuFind\Db\Row; namespace VuFind\Db\Row;
use Laminas\Db\Sql\Expression; use Laminas\Db\Sql\Expression;
use Laminas\Db\Sql\Select;
use VuFind\Db\Table\Resource as ResourceTable; use VuFind\Db\Table\Resource as ResourceTable;
/** /**
...@@ -74,7 +75,7 @@ class Tags extends RowGateway implements \VuFind\Db\Table\DbTableAwareInterface ...@@ -74,7 +75,7 @@ class Tags extends RowGateway implements \VuFind\Db\Table\DbTableAwareInterface
new Expression( new Expression(
'DISTINCT(?)', ['resource.id'], 'DISTINCT(?)', ['resource.id'],
[Expression::TYPE_IDENTIFIER] [Expression::TYPE_IDENTIFIER]
), '*' ), Select::SQL_STAR
] ]
); );
$select->join( $select->join(
......
...@@ -30,6 +30,7 @@ namespace VuFind\Db\Row; ...@@ -30,6 +30,7 @@ namespace VuFind\Db\Row;
use Laminas\Crypt\BlockCipher as BlockCipher; use Laminas\Crypt\BlockCipher as BlockCipher;
use Laminas\Crypt\Symmetric\Openssl; use Laminas\Crypt\Symmetric\Openssl;
use Laminas\Db\Sql\Expression; use Laminas\Db\Sql\Expression;
use Laminas\Db\Sql\Select;
/** /**
* Row Definition for user * Row Definition for user
...@@ -338,7 +339,7 @@ class User extends RowGateway implements \VuFind\Db\Table\DbTableAwareInterface, ...@@ -338,7 +339,7 @@ class User extends RowGateway implements \VuFind\Db\Table\DbTableAwareInterface,
$callback = function ($select) use ($userId) { $callback = function ($select) use ($userId) {
$select->columns( $select->columns(
[ [
'*', Select::SQL_STAR,
'cnt' => new Expression( 'cnt' => new Expression(
'COUNT(DISTINCT(?))', ['ur.resource_id'], 'COUNT(DISTINCT(?))', ['ur.resource_id'],
[Expression::TYPE_IDENTIFIER] [Expression::TYPE_IDENTIFIER]
......
...@@ -29,6 +29,7 @@ namespace VuFind\Db\Table; ...@@ -29,6 +29,7 @@ namespace VuFind\Db\Table;
use Laminas\Db\Adapter\Adapter; use Laminas\Db\Adapter\Adapter;
use Laminas\Db\Sql\Expression; use Laminas\Db\Sql\Expression;
use Laminas\Db\Sql\Select;
use VuFind\Db\Row\RowGateway; use VuFind\Db\Row\RowGateway;
/** /**
...@@ -74,7 +75,7 @@ class Comments extends Gateway ...@@ -74,7 +75,7 @@ class Comments extends Gateway
} }
$callback = function ($select) use ($resource) { $callback = function ($select) use ($resource) {
$select->columns(['*']); $select->columns([Select::SQL_STAR]);
$select->join( $select->join(
['u' => 'user'], 'u.id = comments.user_id', ['u' => 'user'], 'u.id = comments.user_id',
['firstname', 'lastname'], ['firstname', 'lastname'],
......
...@@ -29,6 +29,7 @@ namespace VuFind\Db\Table; ...@@ -29,6 +29,7 @@ namespace VuFind\Db\Table;
use Laminas\Db\Adapter\Adapter; use Laminas\Db\Adapter\Adapter;
use Laminas\Db\Sql\Expression; use Laminas\Db\Sql\Expression;
use Laminas\Db\Sql\Select;
use VuFind\Date\Converter as DateConverter; use VuFind\Date\Converter as DateConverter;
use VuFind\Db\Row\RowGateway; use VuFind\Db\Row\RowGateway;
use VuFind\Record\Loader; use VuFind\Record\Loader;
...@@ -163,7 +164,7 @@ class Resource extends Gateway ...@@ -163,7 +164,7 @@ class Resource extends Gateway
new Expression( new Expression(
'DISTINCT(?)', ['resource.id'], 'DISTINCT(?)', ['resource.id'],
[Expression::TYPE_IDENTIFIER] [Expression::TYPE_IDENTIFIER]
), '*' ), Select::SQL_STAR
] ]
); );
$s->join( $s->join(
......
...@@ -29,6 +29,7 @@ namespace VuFind\Db\Table; ...@@ -29,6 +29,7 @@ namespace VuFind\Db\Table;
use Laminas\Db\Adapter\Adapter; use Laminas\Db\Adapter\Adapter;
use Laminas\Db\Sql\Expression; use Laminas\Db\Sql\Expression;
use Laminas\Db\Sql\Select;
use VuFind\Db\Row\RowGateway; use VuFind\Db\Row\RowGateway;
/** /**
...@@ -166,7 +167,7 @@ class ResourceTags extends Gateway ...@@ -166,7 +167,7 @@ class ResourceTags extends Gateway
'resource_id' => new Expression( 'resource_id' => new Expression(
'DISTINCT(?)', ['resource_tags.resource_id'], 'DISTINCT(?)', ['resource_tags.resource_id'],
[Expression::TYPE_IDENTIFIER] [Expression::TYPE_IDENTIFIER]
), '*' ), Select::SQL_STAR
] ]
); );
$select->join( $select->join(
......
...@@ -149,7 +149,7 @@ class Tags extends Gateway ...@@ -149,7 +149,7 @@ class Tags extends Gateway
$select->join( $select->join(
['resource' => 'resource'], ['resource' => 'resource'],
'rt.resource_id = resource.id', 'rt.resource_id = resource.id',
'*' Select::SQL_STAR
); );
if ($fuzzy) { if ($fuzzy) {
$select->where->literal('lower(tags.tag) like lower(?)', [$q]); $select->where->literal('lower(tags.tag) like lower(?)', [$q]);
......
...@@ -29,6 +29,7 @@ namespace VuFind\Db\Table; ...@@ -29,6 +29,7 @@ namespace VuFind\Db\Table;
use Laminas\Db\Adapter\Adapter; use Laminas\Db\Adapter\Adapter;
use Laminas\Db\Sql\Expression; use Laminas\Db\Sql\Expression;
use Laminas\Db\Sql\Select;
use Laminas\Session\Container; use Laminas\Session\Container;
use VuFind\Db\Row\RowGateway; use VuFind\Db\Row\RowGateway;
use VuFind\Exception\LoginRequired as LoginRequiredException; use VuFind\Exception\LoginRequired as LoginRequiredException;
...@@ -128,7 +129,7 @@ class UserList extends Gateway ...@@ -128,7 +129,7 @@ class UserList extends Gateway
new Expression( new Expression(
'DISTINCT(?)', ['user_list.id'], 'DISTINCT(?)', ['user_list.id'],
[Expression::TYPE_IDENTIFIER] [Expression::TYPE_IDENTIFIER]
), '*' ), Select::SQL_STAR
] ]
); );
$select->join( $select->join(
......
...@@ -29,6 +29,7 @@ namespace VuFind\Db\Table; ...@@ -29,6 +29,7 @@ namespace VuFind\Db\Table;
use Laminas\Db\Adapter\Adapter; use Laminas\Db\Adapter\Adapter;
use Laminas\Db\Sql\Expression; use Laminas\Db\Sql\Expression;
use Laminas\Db\Sql\Select;
use VuFind\Db\Row\RowGateway; use VuFind\Db\Row\RowGateway;
/** /**
...@@ -78,7 +79,7 @@ class UserResource extends Gateway ...@@ -78,7 +79,7 @@ class UserResource extends Gateway
new Expression( new Expression(
'DISTINCT(?)', ['user_resource.id'], 'DISTINCT(?)', ['user_resource.id'],
[Expression::TYPE_IDENTIFIER] [Expression::TYPE_IDENTIFIER]
), '*' ), Select::SQL_STAR
] ]
); );
$select->join( $select->join(
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment