Browse Source

Caching composer packages in appveyor

Some debugging code for appveyor

More debugging for appveyor

Better cache folder for appveyor

More debugging code for appveyor
Jose Lorenzo Rodriguez 10 years ago
parent
commit
1afee118af
2 changed files with 7 additions and 1 deletions
  1. 4 1
      appveyor.yml
  2. 3 0
      src/ORM/Query.php

+ 4 - 1
appveyor.yml

@@ -3,6 +3,9 @@ shallow_clone: false
 platform: 'x86'
 clone_folder: c:\projects\cakephp
 
+cache:
+  - '%LOCALAPPDATA%\Composer'
+
 branches:
   only:
     - master
@@ -80,4 +83,4 @@ before_test:
 test_script:
   - sqlcmd -S ".\SQL2012SP1" -U sa -P Password12! -Q "create database cakephp;"
   - cd C:\projects\cakephp
-  - vendor\bin\phpunit.bat
+  - vendor\bin\phpunit.bat --stop-on-error --filter testPaginateQueryWithBindValue

+ 3 - 0
src/ORM/Query.php

@@ -723,11 +723,13 @@ class Query extends DatabaseQuery implements JsonSerializable, QueryInterface
             count($query->clause('union')) ||
             $query->clause('having')
         );
+        debug($complex);
 
         if (!$complex) {
             // Expression fields could have bound parameters.
             foreach ($query->clause('select') as $field) {
                 if ($field instanceof ExpressionInterface) {
+                    debug($field);
                     $complex = true;
                     break;
                 }
@@ -737,6 +739,7 @@ class Query extends DatabaseQuery implements JsonSerializable, QueryInterface
         if (!$complex && $this->_valueBinder !== null) {
             $order = $this->clause('order');
             $complex = $order === null ? false : $order->hasNestedExpression();
+            debug($complex);
         }
 
         $count = ['count' => $query->func()->count('*')];