Skip to content

Commit 16a5285

Browse files
committed
Merge branch 'master' of github.com:joomla-framework/database
2 parents 8784e72 + 242fda3 commit 16a5285

File tree

6 files changed

+21
-19
lines changed

6 files changed

+21
-19
lines changed
File renamed without changes.

.github/ISSUE_TEMPLATE.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
### Steps to reproduce the issue
2+
3+
4+
### Expected result
5+
6+
7+
### Actual result
8+
9+
10+
### System information (as much as possible)
11+
12+
13+
### Additional comments
14+

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Pull Request for Issue #
2+
3+
### Summary of Changes
4+
5+
### Testing Instructions
6+
7+
### Documentation Changes Required

src/Mysqli/MysqliDriver.php

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -576,11 +576,6 @@ public function execute()
576576
// Take a local copy so that we don't modify the original query and cause issues later
577577
$sql = $this->replacePrefix((string) $this->sql);
578578

579-
if ($this->limit > 0 || $this->offset > 0)
580-
{
581-
$sql .= ' LIMIT ' . $this->offset . ', ' . $this->limit;
582-
}
583-
584579
// Increment the query counter.
585580
$this->count++;
586581

@@ -886,9 +881,6 @@ public function transactionStart($asSavepoint = false)
886881
{
887882
$this->connect();
888883

889-
// Disallow auto commit
890-
$this->connection->autocommit(false);
891-
892884
if (!$asSavepoint || !$this->transactionDepth)
893885
{
894886
if ($this->executeUnpreparedQuery('START TRANSACTION'))

src/Pdo/PdoDriver.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -371,12 +371,6 @@ public function execute()
371371
// Take a local copy so that we don't modify the original query and cause issues later
372372
$sql = $this->replacePrefix((string) $this->sql);
373373

374-
if ($this->limit > 0 || $this->offset > 0)
375-
{
376-
// @TODO
377-
$sql .= ' LIMIT ' . $this->offset . ', ' . $this->limit;
378-
}
379-
380374
// Increment the query counter.
381375
$this->count++;
382376

src/Postgresql/PostgresqlDriver.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -723,11 +723,6 @@ public function execute()
723723
// Take a local copy so that we don't modify the original query and cause issues later
724724
$sql = $this->replacePrefix((string) $this->sql);
725725

726-
if ($this->limit > 0 || $this->offset > 0)
727-
{
728-
$sql .= ' LIMIT ' . $this->limit . ' OFFSET ' . $this->offset;
729-
}
730-
731726
$count = $this->getCount();
732727

733728
// Increment the query counter.

0 commit comments

Comments
 (0)