Skip to content

add suporte for illuminate database >= 5.2 #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

add suporte for illuminate database >= 5.2 #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
483ab23
add suporte for illuminate database >= 5.2
May 7, 2017
b08f085
amment suporte for illuminate database >= 5.2
May 7, 2017
1893721
amment suporte for illuminate database >= 5.2
May 7, 2017
42e4981
change composer version namespace
May 9, 2017
0e8ab27
change composer requires
May 9, 2017
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
16 changes: 10 additions & 6 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "expressodev/laravel-codeigniter-db",
"name": "carlosocarvalho/eloquent-codeigniter",
"type": "library",
"description": "Integration layer allowing use of the Laravel database library in CodeIgniter applications",
"keywords": [
Expand All @@ -13,20 +13,24 @@
"orm"
],
"license": "MIT",
"authors": [
{
"authors": [{
"name": "Adrian Macneil",
"email": "[email protected]"
},
{
"name": "Carlos Carvalho",
"email": "[email protected]"
}
],
"autoload": {
"psr-4": { "Illuminate\\CodeIgniter\\" : "src/" }
"psr-4": { "Illuminate\\CodeIgniter\\": "src/" }
},
"require": {
"illuminate/database": "~4.1|~5.0"
"illuminate/database": "5.2",
"php": ">=5.4"
},
"require-dev": {
"mockery/mockery": "~0.9",
"phpunit/phpunit": "~4.1"
}
}
}
38 changes: 22 additions & 16 deletions src/CodeIgniterConnection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,20 +94,26 @@ protected function reconnectIfMissingConnection()
* @param array $bindings
* @return array
*/
public function select($query, $bindings = array())
public function select($query, $bindings = array(), $useReadPdo = false)
{
$self = $this;

return $this->run($query, $bindings, function($me, $query, $bindings) use ($self) {
if ($me->pretending()) return array();
return $this->run($query, $bindings, function( $query, $bindings) use ($self, $useReadPdo) {
//dump( $me->pretending());
if ($this->pretending()) return array();

// pass query to CodeIgniter database layer
$bindings = $me->prepareBindings($bindings);
$bindings = $this->prepareBindings($bindings);

return $self->fetchResult($self->ci->db->query($query, $bindings));
return $this->fetchResult($this->ci->db->query($query, $bindings));
});
}


public function getFetchMode()
{
return $this->fetchMode;
}

/**
* Fetch a CodeIgniter result set as an array or object, emulating current PDO fetch mode
*
Expand Down Expand Up @@ -138,13 +144,13 @@ public function statement($query, $bindings = array())
{
$self = $this;

return $this->run($query, $bindings, function($me, $query, $bindings) use ($self) {
if ($me->pretending()) return true;
return $this->run($query, $bindings, function( $query, $bindings) {
if ($this->pretending()) return true;

// pass query to CodeIgniter database layer
$bindings = $me->prepareBindings($bindings);
$bindings = $this->prepareBindings($bindings);

return (bool) $self->ci->db->query($query, $bindings);
return (bool) $this->ci->db->query($query, $bindings);
});
}

Expand All @@ -157,17 +163,17 @@ public function statement($query, $bindings = array())
*/
public function affectingStatement($query, $bindings = array())
{
$self = $this;


return $this->run($query, $bindings, function($me, $query, $bindings) use ($self) {
if ($me->pretending()) return 0;
return $this->run($query, $bindings, function( $query, $bindings) {
if ($this->pretending()) return 0;

// pass query to CodeIgniter database layer
$bindings = $me->prepareBindings($bindings);
$self->ci->db->query($query, $bindings);
$bindings = $this->prepareBindings($bindings);
$this->ci->db->query($query, $bindings);

// return number of rows affected
return $self->ci->db->affected_rows();
return $this->ci->db->affected_rows();
});
}

Expand Down