Skip to content

Commit 5d07f7d

Browse files
committed
removed useless type juggling
1 parent 52e8d59 commit 5d07f7d

File tree

7 files changed

+12
-12
lines changed

7 files changed

+12
-12
lines changed

src/Database/Drivers/MySqlDriver.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,8 @@ public function applyLimit(string &$sql, ?int $limit, ?int $offset): void
128128

129129
} elseif ($limit !== NULL || $offset) {
130130
// see http://dev.mysql.com/doc/refman/5.0/en/select.html
131-
$sql .= ' LIMIT ' . ($limit === NULL ? '18446744073709551615' : (int) $limit)
132-
. ($offset ? ' OFFSET ' . (int) $offset : '');
131+
$sql .= ' LIMIT ' . ($limit === NULL ? '18446744073709551615' : $limit)
132+
. ($offset ? ' OFFSET ' . $offset : '');
133133
}
134134
}
135135

src/Database/Drivers/OciDriver.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,11 @@ public function applyLimit(string &$sql, ?int $limit, ?int $offset): void
111111
} elseif ($offset) {
112112
// see http://www.oracle.com/technology/oramag/oracle/06-sep/o56asktom.html
113113
$sql = 'SELECT * FROM (SELECT t.*, ROWNUM AS "__rnum" FROM (' . $sql . ') t '
114-
. ($limit !== NULL ? 'WHERE ROWNUM <= ' . ((int) $offset + (int) $limit) : '')
115-
. ') WHERE "__rnum" > '. (int) $offset;
114+
. ($limit !== NULL ? 'WHERE ROWNUM <= ' . ($offset + $limit) : '')
115+
. ') WHERE "__rnum" > ' . $offset;
116116

117117
} elseif ($limit !== NULL) {
118-
$sql = 'SELECT * FROM (' . $sql . ') WHERE ROWNUM <= ' . (int) $limit;
118+
$sql = 'SELECT * FROM (' . $sql . ') WHERE ROWNUM <= ' . $limit;
119119
}
120120
}
121121

src/Database/Drivers/OdbcDriver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public function applyLimit(string &$sql, ?int $limit, ?int $offset): void
9191
throw new Nette\InvalidArgumentException('Negative offset or limit.');
9292

9393
} elseif ($limit !== NULL) {
94-
$sql = preg_replace('#^\s*(SELECT(\s+DISTINCT|\s+ALL)?|UPDATE|DELETE)#i', '$0 TOP ' . (int) $limit, $sql, 1, $count);
94+
$sql = preg_replace('#^\s*(SELECT(\s+DISTINCT|\s+ALL)?|UPDATE|DELETE)#i', '$0 TOP ' . $limit, $sql, 1, $count);
9595
if (!$count) {
9696
throw new Nette\InvalidArgumentException('SQL query must begin with SELECT, UPDATE or DELETE command.');
9797
}

src/Database/Drivers/PgSqlDriver.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,10 @@ public function applyLimit(string &$sql, ?int $limit, ?int $offset): void
114114
throw new Nette\InvalidArgumentException('Negative offset or limit.');
115115
}
116116
if ($limit !== NULL) {
117-
$sql .= ' LIMIT ' . (int) $limit;
117+
$sql .= ' LIMIT ' . $limit;
118118
}
119119
if ($offset) {
120-
$sql .= ' OFFSET ' . (int) $offset;
120+
$sql .= ' OFFSET ' . $offset;
121121
}
122122
}
123123

src/Database/Drivers/SqliteDriver.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ public function applyLimit(string &$sql, ?int $limit, ?int $offset): void
120120
throw new Nette\InvalidArgumentException('Negative offset or limit.');
121121

122122
} elseif ($limit !== NULL || $offset) {
123-
$sql .= ' LIMIT ' . ($limit === NULL ? '-1' : (int) $limit)
124-
. ($offset ? ' OFFSET ' . (int) $offset : '');
123+
$sql .= ' LIMIT ' . ($limit === NULL ? '-1' : $limit)
124+
. ($offset ? ' OFFSET ' . $offset : '');
125125
}
126126
}
127127

src/Database/Drivers/SqlsrvDriver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public function applyLimit(string &$sql, ?int $limit, ?int $offset): void
104104
throw new Nette\NotSupportedException('Offset is not supported by this database.');
105105

106106
} elseif ($limit !== NULL) {
107-
$sql = preg_replace('#^\s*(SELECT(\s+DISTINCT|\s+ALL)?|UPDATE|DELETE)#i', '$0 TOP ' . (int) $limit, $sql, 1, $count);
107+
$sql = preg_replace('#^\s*(SELECT(\s+DISTINCT|\s+ALL)?|UPDATE|DELETE)#i', '$0 TOP ' . $limit, $sql, 1, $count);
108108
if (!$count) {
109109
throw new Nette\InvalidArgumentException('SQL query must begin with SELECT, UPDATE or DELETE command.');
110110
}

src/Database/SqlLiteral.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class SqlLiteral
2828

2929
public function __construct(string $value, array $parameters = [])
3030
{
31-
$this->value = (string) $value;
31+
$this->value = $value;
3232
$this->parameters = $parameters;
3333
}
3434

0 commit comments

Comments
 (0)