adjust to latest develop

Author: mvorisek

README.md

@@ -191,7 +191,9 @@ $data = new JobReport($db);
 // BarChart wants aggregated data
 $data->addExpression('month', ['expr' => 'month([date])']);
 $aggregate = new AggregateModel($data);
-$aggregate->setGroupBy('month', ['profit_margin' => 'sum']);
+$aggregate->setGroupBy(['month'], [
+    'profit_margin' => ['expr' => 'sum'],
+]);
 
 // associate presentation with data
 $chart->setModel($aggregate, ['month', 'profit_margin']);

docs/aggregates.rst

@@ -25,7 +25,7 @@ in various ways to fine-tune aggregation. Below is one sample use::
     $aggregate->addField('country');
     $aggregate->setGroupBy(['country_id'], [
             'count' => ['expr' => 'count(*)', 'type' => 'integer'],
-            'total_amount' => ['expr' => 'sum([amount])', 'type' => 'atk4_money']
+            'total_amount' => ['expr' => 'sum([amount])', 'type' => 'atk4_money'],
         ],
     );
 
@@ -40,6 +40,6 @@ Below is how opening balance can be built::
 
     // we actually need grouping by nominal
     $ledger->setGroupBy(['nominal_id'], [
-        'opening_balance' => ['expr' => 'sum([amount])', 'type' => 'atk4_money']
+        'opening_balance' => ['expr' => 'sum([amount])', 'type' => 'atk4_money'],
     ]);
 

docs/overview.rst

@@ -206,9 +206,9 @@ order to use grouping with Agile Data, your code would be::
 
     $aggregate = new AggregateModel(new Sale($db));
     $aggregate->setGroupBy(['contractor_to', 'type'], [ // groups by 2 columns
-        'c' => 'count(*)', // defines aggregate formulas for fields
-        'qty' => 'sum([])', // [] refers back to qty
-        'total' => 'sum([amount])', // can specify any field here
+        'c' => ['expr' => 'count(*)'], // defines aggregate formulas for fields
+        'qty' => ['expr' => 'sum([])'], // [] refers back to qty
+        'total' => ['expr' => 'sum([amount])'], // can specify any field here
     ]);
 
 

src/Model/AggregateModel.php

@@ -18,7 +18,9 @@
  * It's quite simple to set up.
  *
  * $aggregate = new AggregateModel($mymodel);
- * $aggregate->setGroupBy(['first','last'], ['salary'=>'sum([])'];
+ * $aggregate->setGroupBy(['first', 'last'], [
+ *     'salary' => ['expr' => 'sum([])'],
+ * ];
  *
  * your resulting model will have 3 fields:
  *  first, last, salary
@@ -32,7 +34,9 @@
  * permitted to add expressions.
  *
  * You can also pass seed (for example field type) when aggregating:
- * $aggregate->setGroupBy(['first', 'last'], ['salary' => ['sum([])', 'type' => 'atk4_money']];
+ * $aggregate->setGroupBy(['first', 'last'], [
+ *     'salary' => ['expr' => 'sum([])', 'type' => 'atk4_money'],
+ * ];
  *
  * @property Persistence\Sql $persistence
  * @property Model           $table
@@ -90,7 +94,7 @@ public function setGroupBy(array $fields, array $aggregateExpressions = [])
                 $args = [$this->table->getField($name)];
             }
 
-            $seed[0 /* TODO 'expr' was here, 0 fixes tests, but 'expr' in seed might this be defined */] = $this->table->expr($seed[0] ?? $seed['expr'], $args);
+            $seed['expr'] = $this->table->expr($seed['expr'], $args);
 
             // now add the expressions here
             $this->addExpression($name, $seed);

tests/ModelAggregateTest.php

@@ -132,7 +132,7 @@ public function testGroupSelectExpr(): void
             'amount' => ['expr' => 'sum([])', 'type' => 'atk4_money'],
         ]);
 
-        $aggregate->addExpression('double', ['[s]+[amount]', 'type' => 'atk4_money']);
+        $aggregate->addExpression('double', ['expr' => '[s] + [amount]', 'type' => 'atk4_money']);
 
         $this->assertSameExportUnordered(
             [
@@ -154,7 +154,7 @@ public function testGroupSelectCondition(): void
             'amount' => ['expr' => 'sum([])', 'type' => 'atk4_money'],
         ]);
 
-        $aggregate->addExpression('double', ['[s]+[amount]', 'type' => 'atk4_money']);
+        $aggregate->addExpression('double', ['expr' => '[s] + [amount]', 'type' => 'atk4_money']);
 
         $this->assertSameExportUnordered(
             [
@@ -175,7 +175,7 @@ public function testGroupSelectCondition2(): void
             'amount' => ['expr' => 'sum([])', 'type' => 'atk4_money'],
         ]);
 
-        $aggregate->addExpression('double', ['[s]+[amount]', 'type' => 'atk4_money']);
+        $aggregate->addExpression('double', ['expr' => '[s] + [amount]', 'type' => 'atk4_money']);
         $aggregate->addCondition(
             'double',
             '>',
@@ -201,7 +201,7 @@ public function testGroupSelectCondition3(): void
             'amount' => ['expr' => 'sum([])', 'type' => 'atk4_money'],
         ]);
 
-        $aggregate->addExpression('double', ['[s]+[amount]', 'type' => 'atk4_money']);
+        $aggregate->addExpression('double', ['expr' => '[s] + [amount]', 'type' => 'atk4_money']);
         $aggregate->addCondition(
             'double',
             // TODO Sqlite bind param does not work, expr needed, even if casted to float with DBAL type (comparison works only if casted to/bind as int)
@@ -226,7 +226,7 @@ public function testGroupSelectCondition4(): void
             'amount' => ['expr' => 'sum([])', 'type' => 'atk4_money'],
         ]);
 
-        $aggregate->addExpression('double', ['[s]+[amount]', 'type' => 'atk4_money']);
+        $aggregate->addExpression('double', ['expr' => '[s] + [amount]', 'type' => 'atk4_money']);
         $aggregate->addCondition('client_id', 2);
 
         $this->assertSame(