浏览代码

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 年之前
父节点
当前提交
1afee118af
共有 2 个文件被更改,包括 7 次插入1 次删除
  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'
 platform: 'x86'
 clone_folder: c:\projects\cakephp
 clone_folder: c:\projects\cakephp
 
 
+cache:
+  - '%LOCALAPPDATA%\Composer'
+
 branches:
 branches:
   only:
   only:
     - master
     - master
@@ -80,4 +83,4 @@ before_test:
 test_script:
 test_script:
   - sqlcmd -S ".\SQL2012SP1" -U sa -P Password12! -Q "create database cakephp;"
   - sqlcmd -S ".\SQL2012SP1" -U sa -P Password12! -Q "create database cakephp;"
   - cd C:\projects\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')) ||
             count($query->clause('union')) ||
             $query->clause('having')
             $query->clause('having')
         );
         );
+        debug($complex);
 
 
         if (!$complex) {
         if (!$complex) {
             // Expression fields could have bound parameters.
             // Expression fields could have bound parameters.
             foreach ($query->clause('select') as $field) {
             foreach ($query->clause('select') as $field) {
                 if ($field instanceof ExpressionInterface) {
                 if ($field instanceof ExpressionInterface) {
+                    debug($field);
                     $complex = true;
                     $complex = true;
                     break;
                     break;
                 }
                 }
@@ -737,6 +739,7 @@ class Query extends DatabaseQuery implements JsonSerializable, QueryInterface
         if (!$complex && $this->_valueBinder !== null) {
         if (!$complex && $this->_valueBinder !== null) {
             $order = $this->clause('order');
             $order = $this->clause('order');
             $complex = $order === null ? false : $order->hasNestedExpression();
             $complex = $order === null ? false : $order->hasNestedExpression();
+            debug($complex);
         }
         }
 
 
         $count = ['count' => $query->func()->count('*')];
         $count = ['count' => $query->func()->count('*')];