Merge pull request #27 from itosho/v1.2.1

v1.2.1

Author: itosho

.semver

@@ -4,10 +4,10 @@ services:
   - mysql
 
 php:
-  - 7.0
   - 7.1
   - 7.2
   - 7.3
+  - 7.4
 
 sudo: false
 
@@ -22,17 +22,14 @@ matrix:
   fast_finish: true
 
   include:
-    - php: 7.3
+    - php: 7.4
       env: PREFER_LOWEST="" DB=mysql db_user=root db_host=0.0.0.0 db_name=cakephp_test
 
-    - php: '7.4snapshot'
-      env: PREFER_LOWEST="" DB=mysql db_user=root db_host=0.0.0.0 db_name=cakephp_test
-
-    - php: 7.3
-      env: PHPCS=1 DEFAULT=0 PREFER_LOWEST=" 
+    - php: 7.4
+      env: PHPCS=1 DEFAULT=0 PREFER_LOWEST=""
 
-    - php: 7.3
-      env: PHPSTAN=1 DEFAULT=0 PREFER_LOWEST=" 
+    - php: 7.4
+      env: PHPSTAN=1 DEFAULT=0 PREFER_LOWEST=""
 
 
 cache:
@@ -41,8 +38,6 @@ cache:
     - $HOME/.composer/cache
 
 before_script:
-  - if [[ $TRAVIS_PHP_VERSION != '7.4snapshot' ]]; then phpenv config-rm xdebug.ini; fi
-
   - composer self-update
   - composer update --prefer-stable --prefer-dist --no-interaction $PREFER_LOWEST
 
@@ -51,19 +46,16 @@ before_script:
   - if [[ $PHPCS = 1 ]]; then composer require cakephp/cakephp-codesniffer:"^3.0"; fi
   - if [[ $PHPSTAN = 1 ]]; then composer require phpstan/phpstan; fi
 
-  # see: https://github.com/cakephp/chronos/issues/106
-  - if [[ $TRAVIS_PHP_VERSION != 7.0 && $PREFER_LOWEST != "" ]]; then composer require  --prefer-stable --prefer-dist --no-interaction $PREFER_LOWEST cakephp/chronos:^1.0.1; fi
-
 script:
-  - if [[ $DEFAULT = 1 && $TRAVIS_PHP_VERSION != 7.3 ]]; then vendor/bin/phpunit; fi
-  - if [[ $DEFAULT = 1 && $TRAVIS_PHP_VERSION = 7.3 ]]; then phpdbg -qrr vendor/bin/phpunit --coverage-clover=clover.xml; fi
+  - if [[ $DEFAULT = 1 && $TRAVIS_PHP_VERSION != 7.4 ]]; then vendor/bin/phpunit; fi
+  - if [[ $DEFAULT = 1 && $TRAVIS_PHP_VERSION = 7.4 ]]; then phpdbg -qrr vendor/bin/phpunit --coverage-clover=clover.xml; fi
 
   - if [[ $PHPCS = 1 ]]; then vendor/bin/phpcs -n -p --extensions=php --standard=vendor/cakephp/cakephp-codesniffer/CakePHP ./src ./tests; fi
   - if [[ $PHPSTAN = 1 ]]; then vendor/bin/phpstan analyse -c phpstan.neon -l 7 src; fi
 
 after_success:
   - |
-    if [[ $DEFAULT = 1 && $TRAVIS_PHP_VERSION = 7.3 ]]; then
+    if [[ $DEFAULT = 1 && $TRAVIS_PHP_VERSION = 7.4 ]]; then
       curl -s https://codecov.io/bash > codecov
       sed -i -e 's/TRAVIS_.*_VERSION/^TRAVIS_.*_VERSION=/' codecov
       bash codecov

.travis.yml

@@ -10,8 +10,8 @@ CakePHP behavior plugin for easily some complicated queries.
 
 ## Requirements
 
-- PHP 7.0+
-- CakePHP 3.5+
+- PHP 7.1+
+- CakePHP 3.6+
 - MySQL 5.6+
 
 ## Installation
@@ -28,12 +28,12 @@ composer require itosho/easy-query
 $this->Tags = TableRegistry::get('Tags');
 $this->Tags->addBehavior('Itosho/EasyQuery.Upsert', [
     'uniqueColumns' => ['name'],
-    'updateColumns' => ['description', 'modified']
+    'updateColumns' => ['description', 'modified'],
 ]);
 
 $data = [
     'name' => 'cakephp',
-    'description' => 'php web framework'
+    'description' => 'php web framework',
 ];
 $entity = $this->Tags->newEntity($data);
 $this->Tags->upsert($entity);
@@ -44,17 +44,17 @@ $this->Tags->upsert($entity);
 ```php
 $this->Tags = TableRegistry::get('Tags');
 $this->Tags->addBehavior('Itosho/EasyQuery.Upsert', [
-    'updateColumns' => ['description', 'modified']
+    'updateColumns' => ['description', 'modified'],
 ]);
 
 $data = [
     [
         'name' => 'cakephp',
-        'description' => 'php web framework'
+        'description' => 'php web framework',
     ],
     [
         'name' => 'rubyonrails',
-        'description' => 'ruby web framework'
+        'description' => 'ruby web framework',
     ]
 ];
 $entities = $this->Tags->newEntities($data);
@@ -71,12 +71,12 @@ $data = [
     [
         'title' => 'First Article',
         'body' => 'First Article Body',
-        'published' => '1'
+        'published' => '1',
     ],
     [
         'title' => 'Second Article',
         'body' => 'Second Article Body',
-        'published' => '0'
+        'published' => '0',
     ]
 ];
 $entities = $this->Articles->newEntities($data);
@@ -95,12 +95,10 @@ $this->Articles->addBehavior('Itosho/EasyQuery.Insert');
 
 $data = [
     'title' => 'New Article?',
-    'body' => 'New Article Body?'
+    'body' => 'New Article Body?',
 ];
 $entity = $this->Articles->newEntity($data);
-$condition = [
-    'title' => 'New Article?'
-];
+$condition = ['title' => 'New Article?'];
 
 $this->Articles->insertOnce($entities);
 ```
@@ -123,7 +121,7 @@ $this->Articles->addBehavior('Itosho/EasyQuery.Insert');
 
 $data = [
     'title' => 'New Article',
-    'body' => 'New Article Body'
+    'body' => 'New Article Body',
 ];
 $entity = $this->Articles->newEntity($data);
 
@@ -146,7 +144,7 @@ And you can change the action manually by using `event` config like this.
 ```php
 // default value is true
 $this->Articles->addBehavior('Itosho/EasyQuery.Insert', [
-    'event' => ['beforeSave' => false]
+    'event' => ['beforeSave' => false],
 ]);
 ```
 

CHANGES.md

@@ -26,10 +26,10 @@
     "source": "https://github.com/itosho/easy-query"
   },
   "require": {
-    "cakephp/orm": "^3.5"
+    "cakephp/orm": "^3.6"
   },
   "require-dev": {
-    "cakephp/cakephp": "^3.5",
+    "cakephp/cakephp": "^3.6",
     "phpunit/phpunit": "^5.7.14|^6.0"
   },
   "autoload": {

README.md

@@ -1,2 +1,3 @@
 parameters:
+    checkMissingIterableValueType: false
     ignoreErrors: []

composer.json

@@ -22,7 +22,7 @@ class InsertBehavior extends Behavior
      * @var array
      */
     protected $_defaultConfig = [
-        'event' => ['beforeSave' => true]
+        'event' => ['beforeSave' => true],
     ];
 
     /**
@@ -78,23 +78,18 @@ public function insertOnce(Entity $entity, array $conditions = null)
             $insertData['modified'] = FrozenTime::now()->toDateTimeString();
         }
 
-        $escape = function ($content) {
-            return is_null($content) ? 'NULL' : '\'' . addslashes($content) . '\'';
-        };
-
-        $escapedInsertData = array_map($escape, $insertData);
         $fields = array_keys($insertData);
         $existsConditions = $conditions;
         if (is_null($existsConditions)) {
-            $existsConditions = $this->getExistsConditions($escapedInsertData);
+            $existsConditions = $this->getExistsConditions($insertData);
         }
 
         $query = $this->_table
             ->query()
             ->insert($fields)
             ->epilog(
                 $this
-                    ->buildTmpTableSelectQuery($escapedInsertData)
+                    ->buildTmpTableSelectQuery($insertData)
                     ->where(function (QueryExpression $exp) use ($existsConditions) {
                         $query = $this->_table
                             ->find()
@@ -111,55 +106,61 @@ public function insertOnce(Entity $entity, array $conditions = null)
     /**
      * build tmp table's select query for insert select query
      *
-     * @param array $escapedData escaped array data
+     * @param array $insertData insert data
      * @throws LogicException select query is invalid
      * @return Query tmp table's select query
      */
-    private function buildTmpTableSelectQuery($escapedData)
+    private function buildTmpTableSelectQuery($insertData)
     {
         $driver = $this->_table
             ->getConnection()
             ->getDriver();
         $schema = [];
-        foreach ($escapedData as $key => $value) {
+        $binds = [];
+        foreach ($insertData as $key => $value) {
             $col = $driver->quoteIdentifier($key);
-            $schema[] = "{$value} AS {$col}";
+            if (is_null($value)) {
+                $schema[] = "NULL AS {$col}";
+            } else {
+                $bindKey = ':' . strtolower($key);
+                $binds[$bindKey] = $value;
+                $schema[] = "{$bindKey} AS {$col}";
+            }
         }
 
         $tmpTable = TableRegistry::getTableLocator()->get('tmp', [
-            'schema' => $this->_table->getSchema()
+            'schema' => $this->_table->getSchema(),
         ]);
         $query = $tmpTable
             ->find()
-            ->select(array_keys($escapedData))
+            ->select(array_keys($insertData))
             ->from(
                 sprintf('(SELECT %s) as tmp', implode(',', $schema))
             );
         /** @var Query $selectQuery */
         $selectQuery = $query;
+        foreach ($binds as $key => $value) {
+            $selectQuery->bind($key, $value);
+        }
 
         return $selectQuery;
     }
 
     /**
      * get conditions for finding a record already exists
      *
-     * @param array $escapedData escaped array data
+     * @param array $insertData insert data
      * @return array conditions
      */
-    private function getExistsConditions($escapedData)
+    private function getExistsConditions($insertData)
     {
         $autoFillFields = ['created', 'modified'];
         $existsConditions = [];
-        foreach ($escapedData as $field => $value) {
+        foreach ($insertData as $field => $value) {
             if (in_array($field, $autoFillFields, true)) {
                 continue;
             }
-            if ($value === 'NULL') {
-                $existsConditions[] = "{$field} IS NULL";
-            } else {
-                $existsConditions[] = "{$field} = {$value}";
-            }
+            $existsConditions[$field . ' IS'] = $value;
         }
 
         return $existsConditions;

phpstan.neon

@@ -21,7 +21,7 @@ class UpsertBehavior extends Behavior
     protected $_defaultConfig = [
         'updateColumns' => null,
         'uniqueColumns' => null,
-        'event' => ['beforeSave' => true]
+        'event' => ['beforeSave' => true],
     ];
 
     /**

src/Model/Behavior/InsertBehavior.php

@@ -14,30 +14,30 @@ class ArticlesFixture extends TestFixture
         'created' => 'datetime',
         'modified' => 'datetime',
         '_constraints' => [
-            'primary' => ['type' => 'primary', 'columns' => ['id']]
-        ]
+            'primary' => ['type' => 'primary', 'columns' => ['id']],
+        ],
     ];
     public $records = [
         [
             'title' => 'First Article',
             'body' => 'First Article Body',
             'published' => 1,
             'created' => '2017-09-01 00:00:00',
-            'modified' => '2017-09-01 00:00:00'
+            'modified' => '2017-09-01 00:00:00',
         ],
         [
             'title' => 'Second Article',
             'body' => 'Second Article Body',
             'published' => 1,
             'created' => '2017-09-01 00:00:00',
-            'modified' => '2017-09-01 00:00:00'
+            'modified' => '2017-09-01 00:00:00',
         ],
         [
             'title' => 'Third Article',
             'body' => 'Third Article Body',
             'published' => 1,
             'created' => '2017-09-01 00:00:00',
-            'modified' => '2017-09-01 00:00:00'
-        ]
+            'modified' => '2017-09-01 00:00:00',
+        ],
     ];
 }