@@ -504,7 +504,7 @@ |
||
504 | 504 | |
505 | 505 | try { |
506 | 506 | $stmt->execute()->finish(); |
507 | - } catch( \Aimeos\Base\DB\Exception $e ) { ; } // Ignore duplicates |
|
507 | + } catch( \Aimeos\Base\DB\Exception $e ) {; } // Ignore duplicates |
|
508 | 508 | } |
509 | 509 | } |
510 | 510 | } |
@@ -490,9 +490,13 @@ |
||
490 | 490 | $stmt->bind( 7, $context->datetime() ); //mtime |
491 | 491 | $stmt->bind( 8, $siteid ); |
492 | 492 | |
493 | - try { |
|
493 | + try |
|
494 | + { |
|
494 | 495 | $stmt->execute()->finish(); |
495 | - } catch( \Aimeos\Base\DB\Exception $e ) { ; } // Ignore duplicates |
|
496 | + } |
|
497 | + catch( \Aimeos\Base\DB\Exception $e ) |
|
498 | + { |
|
499 | +; } // Ignore duplicates |
|
496 | 500 | } |
497 | 501 | } |
498 | 502 | } |
@@ -830,7 +830,7 @@ |
||
830 | 830 | |
831 | 831 | try { |
832 | 832 | $stmt->execute()->finish(); |
833 | - } catch( \Aimeos\Base\DB\Exception $e ) { ; } // Ignore duplicates |
|
833 | + } catch( \Aimeos\Base\DB\Exception $e ) {; } // Ignore duplicates |
|
834 | 834 | } |
835 | 835 | |
836 | 836 |
@@ -828,9 +828,13 @@ |
||
828 | 828 | $stmt->bind( 6, $date ); //mtime |
829 | 829 | $stmt->bind( 7, $siteid ); |
830 | 830 | |
831 | - try { |
|
831 | + try |
|
832 | + { |
|
832 | 833 | $stmt->execute()->finish(); |
833 | - } catch( \Aimeos\Base\DB\Exception $e ) { ; } // Ignore duplicates |
|
834 | + } |
|
835 | + catch( \Aimeos\Base\DB\Exception $e ) |
|
836 | + { |
|
837 | +; } // Ignore duplicates |
|
834 | 838 | } |
835 | 839 | |
836 | 840 |
@@ -706,7 +706,7 @@ |
||
706 | 706 | |
707 | 707 | try { |
708 | 708 | $stmt->execute()->finish(); |
709 | - } catch( \Aimeos\Base\DB\Exception $e ) { ; } // Ignore duplicates |
|
709 | + } catch( \Aimeos\Base\DB\Exception $e ) {; } // Ignore duplicates |
|
710 | 710 | } |
711 | 711 | } |
712 | 712 | } |
@@ -682,9 +682,13 @@ |
||
682 | 682 | $stmt->bind( 4, $context->datetime() ); // mtime |
683 | 683 | $stmt->bind( 5, $siteid ); |
684 | 684 | |
685 | - try { |
|
685 | + try |
|
686 | + { |
|
686 | 687 | $stmt->execute()->finish(); |
687 | - } catch( \Aimeos\Base\DB\Exception $e ) { ; } // Ignore duplicates |
|
688 | + } |
|
689 | + catch( \Aimeos\Base\DB\Exception $e ) |
|
690 | + { |
|
691 | +; } // Ignore duplicates |
|
688 | 692 | } |
689 | 693 | } |
690 | 694 | } |
@@ -140,8 +140,7 @@ |
||
140 | 140 | foreach( $cond->getExpressions() as $expr ) { |
141 | 141 | $list = array_merge( $list, $this->getProductIds( $expr ) ); |
142 | 142 | } |
143 | - } |
|
144 | - elseif( $cond instanceof \Aimeos\Base\Criteria\Expression\Compare\Iface ) |
|
143 | + } elseif( $cond instanceof \Aimeos\Base\Criteria\Expression\Compare\Iface ) |
|
145 | 144 | { |
146 | 145 | if( $cond->getName() === 'stock.productid' && $cond->getOperator() === '==' ) { |
147 | 146 | $list = array_merge( $list, (array) $cond->getValue() ); |
@@ -153,8 +153,8 @@ |
||
153 | 153 | { |
154 | 154 | $map = []; |
155 | 155 | |
156 | - $conn = $this->context()->db( 'db-locale' ); |
|
157 | - $tconn = $this->context()->db( 'db-locale', true ); |
|
156 | + $conn = $this->context()->db( 'db-locale' ); |
|
157 | + $tconn = $this->context()->db( 'db-locale', true ); |
|
158 | 158 | |
159 | 159 | $type = \Aimeos\Base\DB\Statement\Base::PARAM_INT; |
160 | 160 | $roots = $conn->create( 'SELECT id, nleft, nright FROM mshop_locale_site WHERE level = 0' )->execute(); |
@@ -39,9 +39,12 @@ |
||
39 | 39 | { |
40 | 40 | $db->for( 'mysql', 'CREATE FULLTEXT INDEX `idx_msindte_content` ON `mshop_index_text` (`content`)' ); |
41 | 41 | |
42 | - try { |
|
42 | + try |
|
43 | + { |
|
43 | 44 | $db->for( 'postgresql', 'CREATE INDEX "idx_msindte_content" ON "mshop_index_text" USING GIN (to_tsvector(\'english\', "content"))' ); |
44 | - } catch( \Exception $e ) { |
|
45 | + } |
|
46 | + catch( \Exception $e ) |
|
47 | + { |
|
45 | 48 | // Doctrine DBAL bug: https://github.com/doctrine/dbal/issues/5351 |
46 | 49 | } |
47 | 50 | } |
@@ -307,8 +307,7 @@ |
||
307 | 307 | */ |
308 | 308 | $path = 'madmin/job/manager/insert'; |
309 | 309 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ) ); |
310 | - } |
|
311 | - else |
|
310 | + } else |
|
312 | 311 | { |
313 | 312 | /** madmin/job/manager/update/mysql |
314 | 313 | * Updates an existing job record in the database |
@@ -619,8 +619,7 @@ |
||
619 | 619 | */ |
620 | 620 | $path = 'mshop/customer/manager/insert'; |
621 | 621 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ) ); |
622 | - } |
|
623 | - else |
|
622 | + } else |
|
624 | 623 | { |
625 | 624 | /** mshop/customer/manager/update/mysql |
626 | 625 | * Updates an existing customer record in the database |
@@ -60,8 +60,7 @@ |
||
60 | 60 | $sort = 'mindte_ft.RANK * mpro."boost"'; |
61 | 61 | |
62 | 62 | $func = $this->getFunctionRelevance(); |
63 | - } |
|
64 | - else |
|
63 | + } else |
|
65 | 64 | { |
66 | 65 | $search = ':site AND mindte."langid" = $1 AND CHARINDEX( $2, content )'; |
67 | 66 | $sort = '-CHARINDEX( $2, content ) * mpro."boost"'; |