Skip to content
This repository was archived by the owner on Sep 20, 2024. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 24 additions & 0 deletions src/Firebird/Connection.php
Original file line number Diff line number Diff line change
Expand Up @@ -153,4 +153,28 @@ public function table($table)

return $query->from($table);
}

public function beginTransaction()
{
if ( $this->transactions == 0 && $this->pdo->getAttribute(PDO::ATTR_AUTOCOMMIT) == 1 ) {
$this->pdo->setAttribute(PDO::ATTR_AUTOCOMMIT, 0);
}
parent::beginTransaction();
}

public function commit()
{
parent::commit();
if ( $this->transactions == 0 && $this->pdo->getAttribute(PDO::ATTR_AUTOCOMMIT) == 0 ) {
$this->pdo->setAttribute(PDO::ATTR_AUTOCOMMIT, 1);
}
}

public function rollBack()
{
parent::rollBack();
if ( $this->transactions == 0 && $this->pdo->getAttribute(PDO::ATTR_AUTOCOMMIT) == 0 ) {
$this->pdo->setAttribute(PDO::ATTR_AUTOCOMMIT, 1);
}
}
}
19 changes: 18 additions & 1 deletion src/Firebird/Query/Grammars/FirebirdGrammar.php
Original file line number Diff line number Diff line change
Expand Up @@ -106,4 +106,21 @@ protected function compileOffset(Builder $query, $limit)
return 'skip '.(int) $limit;
}

}
/**
* Compile an insert and get ID statement into SQL.
*
* @param \Illuminate\Database\Query\Builder $query
* @param array $values
* @param string $sequence
* @return string
*/
public function compileInsertGetId(Builder $query, $values, $sequence)
{
if (is_null($sequence)) {
$sequence = 'id';
}

return $this->compileInsert($query, $values).' returning '.$this->wrap($sequence);
}

}
41 changes: 40 additions & 1 deletion src/Firebird/Query/Processors/FirebirdProcessor.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,46 @@
<?php namespace Firebird\Query\Processors;

use Illuminate\Database\Query\Processors\Processor;
use Illuminate\Database\Query\Builder;

class FirebirdProcessor extends Processor {
/**
* Process an "insert get ID" query.
*
* @param \Illuminate\Database\Query\Builder $query
* @param string $sql
* @param array $values
* @param string $sequence
* @return int
*/
public function processInsertGetId(Builder $query, $sql, $values, $sequence = null)
{
$results = $query->getConnection()->selectFromWriteConnection($sql, $values);

}
$sequence = $sequence ?: 'id';

$result = (array) $results[0];

$id = $result[$sequence];

return is_numeric($id) ? (int) $id : $id;
}

/**
* Process the results of a column listing query.
*
* @param array $results
* @return array
*/
public function processColumnListing($results)
{
$mapping = function ($r) {
$r = (object) $r;

return trim($r->{'RDB$FIELD_NAME'});
};

return array_map($mapping, $results);
}

}
11 changes: 11 additions & 0 deletions src/Firebird/Schema/Grammars/FirebirdGrammar.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,17 @@ public function compileTableExists()
return "SELECT RDB\$RELATION_NAME FROM RDB\$RELATIONS WHERE RDB\$RELATION_NAME = ?";
}

/**
* Compile the query to determine the list of columns.
*
* @param string $table
* @return string
*/
public function compileColumnExists($table)
{
return "SELECT RDB\$RELATION_FIELDS.RDB\$FIELD_NAME FROM RDB\$RELATION_FIELDS WHERE RDB\$RELATION_FIELDS.RDB\$RELATION_NAME = '$table' ";
}

/**
* Compile a create table command.
*
Expand Down