Skip to content

Commit a854a39

Browse files
author
Robert Lester
committed
.
2 parents 3ab2144 + e8e48e9 commit a854a39

File tree

3 files changed

+15
-9
lines changed

3 files changed

+15
-9
lines changed

.phpunit.result.cache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
C:37:"PHPUnit\Runner\DefaultTestResultCache":2244:{a:2:{s:7:"defects";a:13:{s:72:"Lester\EloquentSalesForce\Tests\EloquentSalesForceTest::testObjectCreate";i:4;s:70:"Lester\EloquentSalesForce\Tests\EloquentSalesForceTest::testObjectMass";i:4;s:72:"Lester\EloquentSalesForce\Tests\EloquentSalesForceTest::testObjectUpdate";i:4;s:70:"Lester\EloquentSalesForce\Tests\EloquentSalesForceTest::testWhereBasic";i:4;s:72:"Lester\EloquentSalesForce\Tests\EloquentSalesForceTest::testWhereBoolean";i:4;s:67:"Lester\EloquentSalesForce\Tests\EloquentSalesForceTest::testWhereIn";i:4;s:69:"Lester\EloquentSalesForce\Tests\EloquentSalesForceTest::testWhereDate";i:4;s:72:"Lester\EloquentSalesForce\Tests\EloquentSalesForceTest::testObjectDelete";i:4;s:73:"Lester\EloquentSalesForce\Tests\EloquentSalesForceTest::testRelationships";i:4;s:65:"Lester\EloquentSalesForce\Tests\EloquentSalesForceTest::testJoins";i:4;s:68:"Lester\EloquentSalesForce\Tests\EloquentSalesForceTest::testPaginate";i:4;s:77:"Lester\EloquentSalesForce\Tests\EloquentSalesForceTest::testGetPicklistValues";i:4;s:70:"Lester\EloquentSalesForce\Tests\EloquentSalesForceTest::testBatchQuery";i:4;}s:5:"times";a:13:{s:72:"Lester\EloquentSalesForce\Tests\EloquentSalesForceTest::testObjectCreate";d:1.977;s:70:"Lester\EloquentSalesForce\Tests\EloquentSalesForceTest::testObjectMass";d:2.024;s:72:"Lester\EloquentSalesForce\Tests\EloquentSalesForceTest::testObjectUpdate";d:2.046;s:70:"Lester\EloquentSalesForce\Tests\EloquentSalesForceTest::testWhereBasic";d:0.912;s:72:"Lester\EloquentSalesForce\Tests\EloquentSalesForceTest::testWhereBoolean";d:1.274;s:67:"Lester\EloquentSalesForce\Tests\EloquentSalesForceTest::testWhereIn";d:0.811;s:69:"Lester\EloquentSalesForce\Tests\EloquentSalesForceTest::testWhereDate";d:0.832;s:72:"Lester\EloquentSalesForce\Tests\EloquentSalesForceTest::testObjectDelete";d:1.878;s:73:"Lester\EloquentSalesForce\Tests\EloquentSalesForceTest::testRelationships";d:2.303;s:65:"Lester\EloquentSalesForce\Tests\EloquentSalesForceTest::testJoins";d:2.046;s:68:"Lester\EloquentSalesForce\Tests\EloquentSalesForceTest::testPaginate";d:1.034;s:77:"Lester\EloquentSalesForce\Tests\EloquentSalesForceTest::testGetPicklistValues";d:1.995;s:70:"Lester\EloquentSalesForce\Tests\EloquentSalesForceTest::testBatchQuery";d:0.343;}}}
1+
C:37:"PHPUnit\Runner\DefaultTestResultCache":2241:{a:2:{s:7:"defects";a:13:{s:72:"Lester\EloquentSalesForce\Tests\EloquentSalesForceTest::testObjectCreate";i:4;s:70:"Lester\EloquentSalesForce\Tests\EloquentSalesForceTest::testObjectMass";i:4;s:72:"Lester\EloquentSalesForce\Tests\EloquentSalesForceTest::testObjectUpdate";i:4;s:70:"Lester\EloquentSalesForce\Tests\EloquentSalesForceTest::testWhereBasic";i:4;s:72:"Lester\EloquentSalesForce\Tests\EloquentSalesForceTest::testWhereBoolean";i:4;s:67:"Lester\EloquentSalesForce\Tests\EloquentSalesForceTest::testWhereIn";i:4;s:69:"Lester\EloquentSalesForce\Tests\EloquentSalesForceTest::testWhereDate";i:4;s:72:"Lester\EloquentSalesForce\Tests\EloquentSalesForceTest::testObjectDelete";i:4;s:73:"Lester\EloquentSalesForce\Tests\EloquentSalesForceTest::testRelationships";i:4;s:65:"Lester\EloquentSalesForce\Tests\EloquentSalesForceTest::testJoins";i:4;s:68:"Lester\EloquentSalesForce\Tests\EloquentSalesForceTest::testPaginate";i:4;s:77:"Lester\EloquentSalesForce\Tests\EloquentSalesForceTest::testGetPicklistValues";i:4;s:70:"Lester\EloquentSalesForce\Tests\EloquentSalesForceTest::testBatchQuery";i:4;}s:5:"times";a:13:{s:72:"Lester\EloquentSalesForce\Tests\EloquentSalesForceTest::testObjectCreate";d:1.501;s:70:"Lester\EloquentSalesForce\Tests\EloquentSalesForceTest::testObjectMass";d:1.983;s:72:"Lester\EloquentSalesForce\Tests\EloquentSalesForceTest::testObjectUpdate";d:1.741;s:70:"Lester\EloquentSalesForce\Tests\EloquentSalesForceTest::testWhereBasic";d:0.826;s:72:"Lester\EloquentSalesForce\Tests\EloquentSalesForceTest::testWhereBoolean";d:0.866;s:67:"Lester\EloquentSalesForce\Tests\EloquentSalesForceTest::testWhereIn";d:0.85;s:69:"Lester\EloquentSalesForce\Tests\EloquentSalesForceTest::testWhereDate";d:0.873;s:72:"Lester\EloquentSalesForce\Tests\EloquentSalesForceTest::testObjectDelete";d:1.491;s:73:"Lester\EloquentSalesForce\Tests\EloquentSalesForceTest::testRelationships";d:2.506;s:65:"Lester\EloquentSalesForce\Tests\EloquentSalesForceTest::testJoins";d:1.986;s:68:"Lester\EloquentSalesForce\Tests\EloquentSalesForceTest::testPaginate";d:0.866;s:77:"Lester\EloquentSalesForce\Tests\EloquentSalesForceTest::testGetPicklistValues";d:1.9;s:70:"Lester\EloquentSalesForce\Tests\EloquentSalesForceTest::testBatchQuery";d:0.931;}}}

src/Database/SOQLBuilder.php

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,16 @@ public function toSql()
3434
$query = str_replace('*', $columns, parent::toSql());
3535
$query = str_replace('`', '', $query);
3636
$bindings = array_map(function($item) {
37-
try {
38-
if (\Carbon\Carbon::parse($item) !== false &&
39-
!$this->isSalesForceId($item)) {
37+
try {
38+
if (\Carbon\Carbon::parse($item) !== false && !$this->isSalesForceId($item)) {
4039
return $item;
4140
}
4241
} catch (\Exception $e) {
43-
return "'$item'";
42+
if (is_int($item) || is_float($item)) {
43+
return $item;
44+
} else {
45+
return "'$item'";
46+
}
4447
}
4548
return "'$item'";
4649
}, $this->getBindings());

src/Database/SOQLConnection.php

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,13 +96,16 @@ private function prepare($query, $bindings)
9696
{
9797
$query = str_replace('`', '', $query);
9898
$bindings = array_map(function($item) {
99-
try {
100-
if (Carbon::parse($item) !== false &&
101-
!$this->isSalesForceId($item)) {
99+
try {
100+
if (\Carbon\Carbon::parse($item) !== false && !$this->isSalesForceId($item)) {
102101
return $item;
103102
}
104103
} catch (\Exception $e) {
105-
return "'$item'";
104+
if (is_int($item) || is_float($item)) {
105+
return $item;
106+
} else {
107+
return "'$item'";
108+
}
106109
}
107110
return "'$item'";
108111
}, $bindings);

0 commit comments

Comments
 (0)