Code

Add Model\UnionModel model#677

Code

Open

georgehristov wants to merge 210 commits intodevelopatk4/data:developfrom feature/introduce-aggregate-union-modelsatk4/data:feature/introduce-aggregate-union-modelsCopy head branch name to clipboard

+862

Commits

Commits on Jul 26, 2020

• [update] migrate aggregate and union models to data package

  georgehristov

  committed
  7083cf5

Commits on Jul 27, 2020

• [update] combine union test in single class

  georgehristov

  committed
  9f95593

• [fix] create db tables with all columns

  georgehristov

  committed
  691d9bd

• [update] migrate and update docs

  georgehristov

  committed
  ee88bb5

• [update] php docs

  georgehristov

  committed
  e436599

• [update] variable names

  georgehristov

  committed
  c728ce1

• [update] use generic Model::export method

  georgehristov

  committed
  e3432cf

• [fix] typos

  georgehristov

  committed
  9dcd45d

• [update] improve naming consistency

  georgehristov

  committed
  e2364cb

• [update] provide integration trait for generic support of aggregates on model

  georgehristov

  committed
  19c6689

• Merge branch 'develop' into feature/introduce-aggregate-union-models

  georgehristov

  committed
  0b21ab3

Commits on Dec 2, 2020

• Merge branch 'develop' into feature/introduce-aggregate-union-models

  Show description for ebc06d9
  georgehristov

  committed
  ebc06d9

• [update] add return types

  georgehristov

  committed
  a03dbc5

• Merge branch 'develop' into feature/introduce-aggregate-union-models

  georgehristov

  committed
  1033a0b

• [fix] add method return types in Aggregate and Union

  georgehristov

  committed
  66483ed

• [fix] clone test models on use

  georgehristov

  committed
  4b4affa

• [fix] skip non-aggregate fields on union select sub-query

  georgehristov

  committed
  c43694b

• [fix] add test export sorting order

  georgehristov

  committed
  1325b54

• [fix] teardown class properties

  georgehristov

  committed
  650e449

• [fix] mark test incomplete

  georgehristov

  committed
  bb349c1

• [update] rename properties

  georgehristov

  committed
  ee3be79

Commits on Dec 3, 2020

• [update] add annotations for $persistence and expr

  georgehristov

  committed
  1274012

• [update] use clone of base model

  georgehristov

  committed
  6e5f66a

• [update] method signature and phpdoc

  georgehristov

  committed
  9059644

• [update] aggregate order

  georgehristov

  committed
  8c8bb41

• [refactor] Union::getSubAction

  georgehristov

  committed
  4922475

• [update] code comments

  georgehristov

  committed
  7af4243

• [update] Union::addCondition

  georgehristov

  committed
  6a08906

Commits on Dec 7, 2020

• [update] fix complex conditions handling using field alias

  georgehristov

  committed
  9936315

• Merge branch 'develop' into feature/introduce-aggregate-union-models

  georgehristov

  committed
  5289b65

Commits on Dec 8, 2020

• [fix] revert field alias usage

  georgehristov

  committed
  a8839b1

Commits on Dec 26, 2020

• Merge branch 'develop' into feature/introduce-aggregate-union-models

  georgehristov

  committed
  2595921

Commits on Dec 27, 2020

• [update] to latest develop

  georgehristov

  committed
  b75a23d

• [fix] test

  georgehristov

  committed
  30ece17

• [fix] static analysis errors

  georgehristov

  committed
  8c0080e

• [fix] docs

  georgehristov

  committed
  33c0674

Commits on Dec 29, 2020

• [update] reorder methods and adjust visibility

  georgehristov

  committed
  707c070

• [feature] introduce Model\Aggregate

  georgehristov

  committed
  690e1ca

• [update] avoid modifying existing model Client

  georgehristov

  committed
  2ee790b

• [update] move setup of properties to constructor

  georgehristov

  committed
  4a9f37c

• [update] add docs

  georgehristov

  committed
  d566c62

• [update] use strong argument typing

  georgehristov

  committed
  de06f03

• [update] rename properties to intuitive names

  georgehristov

  committed
  ae45471

• [update] phpdoc types

  georgehristov

  committed
  3dd1ab0

• [update] allow to unset Model::$id_field

  georgehristov

  committed
  5cb2bf8

• [update] use array_merge

  georgehristov

  committed
  68d32d3

• [update] arguments and return types

  georgehristov

  committed
  8c69320

• [update] tests

  georgehristov

  committed
  47fc81d

• [update] docs

  georgehristov

  committed
  adb57dc

• [update] add return type for Invoice

  Show description for b6b0852
  

  georgehristov

  and

  mvorisek

  authored
  b6b0852

• [fix] phpstan issues

  georgehristov

  committed
  a974658

• [update] optimize demo

  georgehristov

  committed
  a176a33

Commits on Dec 30, 2020

• [update] LIMIT functionality

  georgehristov

  committed
  665eb86

Commits on Nov 6, 2021

• Merge branch 'develop' into feature/introduce-aggregate-model

  mvorisek

  committed
  4e2221d

• fix renamed TestCase class

  mvorisek

  committed
  ae0a56a

• fix renamed atk4_money type

  mvorisek

  committed
  722cbdf

• add missing void return type for test cases

  mvorisek

  committed
  1f25740

• fix renamespaced Dsql names

  mvorisek

  committed
  5c40110

• fix stan

  mvorisek

  committed
  d047cd5

Commits on Jan 5, 2022

• Merge branch 'develop' into feature/introduce-aggregate-model

  mvorisek

  committed
  cfae1b1

• fix typo in comment

  mvorisek

  committed
  ad9c90a

• fix SQL render assertions

  mvorisek

  committed
  41637d0

• fix renamed API

  mvorisek

  committed
  a21ef63

• fix comparison/bind for atk4_money typed values for Sqlite

  mvorisek

  committed
  25dc215

Commits on Jan 6, 2022

• Merge branch 'develop' into feature/introduce-aggregate-union-models

  mvorisek

  committed
  4b956bc

• Merge branch 'develop' into feature/introduce-aggregate-model

  mvorisek

  committed
  f62907b

• fix tests by not enforcing use_table_prefixes

  mvorisek

  committed
  0f9bbe8

• workaround mysql server 8.0.27 bug in test

  mvorisek

  committed
  e7639e8

• fix doc cs

  mvorisek

  committed
  787c5d9

• Merge branch 'feature/introduce-aggregate-model' into feature/introduce-aggregate-union-models

  mvorisek

  committed
  138d064

• adjust to the latest atk4/data (by phpstan)

  mvorisek

  committed
  1fa050b

• fix assertions

  mvorisek

  committed
  5593643

• client_id in transaction model

  mvorisek

  committed
  55df20d

• skip tests with wrong fields pushdown

  mvorisek

  committed
  92654fc

• fix grouping for PostgreSQL

  mvorisek

  committed
  f403b82

• fix report test

  mvorisek

  committed
  98cec38

Commits on Jan 9, 2022

• fix/use non-aliased field name for update/delete where

  mvorisek

  committed
  564944c

• fix id typecasting in SQL persistence

  mvorisek

  committed
  7353322

• dedup/impl insert/update/delete methods in main Persistence

  mvorisek

  committed
  e0af1c5

• impl raw write methods

  mvorisek

  committed
  af5333b

• add support for model nesting for SQL

  mvorisek

  committed
  9dd61ba

• fix join/hasMany

  mvorisek

  committed
  ddc2db3

• impl write queries using nested Models

  mvorisek

  committed
  bcd74c5

• use "_tm" as default alias for model-in-model table

  mvorisek

  committed
  a4438ea

• drop unneeded composer requirements

  mvorisek

  committed
  79b2743

Commits on Jan 10, 2022

• Merge branch 'develop' into feature/introduce-aggregate-model

  mvorisek

  committed
  96f6009

• fix/skip one test /w constant column for MSSQL

  mvorisek

  committed
  d5337a0

• Merge branch 'develop' into feature/introduce-aggregate-union-models

  mvorisek

  committed
  8374849

• Merge branch 'feature/introduce-aggregate-model' into feature/introduce-aggregate-union-models

  mvorisek

  committed
  c7ba8ff

• do not accept badly formatted seeds

  mvorisek

  committed
  9e95d1c

• fix unordered export assertions

  mvorisek

  committed
  934041f

• Merge branch 'feature/introduce-aggregate-model' into feature/introduce-aggregate-union-models

  mvorisek

  committed
  59cd671

• fix unordered export assertions

  mvorisek

  committed
  eed9609

• subaction must not add table alias

  mvorisek

  committed
  d654352

• subaction must not wrap in parenthesis

  mvorisek

  committed
  6bf9c9a

• prepare for Union::groupBy always wraps

  mvorisek

  committed
  8f27132

• drop deprecated hook alias

  mvorisek

  committed
  fbc54ae

• fix expr seeding

  mvorisek

  committed
  8e563e5

• allow to group by non-selecting expr, but then do not add that field

  mvorisek

  committed
  a883a75

• fix grouping for PostgreSQL

  mvorisek

  committed
  58b83ee

• Merge branch 'feature/introduce-aggregate-model' into feature/introduce-aggregate-union-models

  mvorisek

  committed
  3fb83e6

• Merge branch 'model_in_model' into feature/introduce-aggregate-model

  mvorisek

  committed
  0540bf9

• Merge branch 'model_in_model' into feature/introduce-aggregate-union-models

  mvorisek

  committed
  6b18dc7

• Merge branch 'feature/introduce-aggregate-model' into feature/introduce-aggregate-union-models

  mvorisek

  committed
  02c64e3

• use "_tu" as default alias for Union model

  mvorisek

  committed
  fb296e1

• createInvoiceAggregate must not add default "client" field

  mvorisek

  committed
  035f36b

• impl Aggregate using model-in-model

  mvorisek

  committed
  65ada49

Commits on Jan 11, 2022

• do not skip WITH test for MariaDB

  mvorisek

  committed
  abfaabe

• add model-in-model tests incl. hooks

  mvorisek

  committed
  12c2c2a

• test with "_id" ID column name

  mvorisek

  committed
  aab0bf9

• fix different ID column across nested models

  mvorisek

  committed
  1a96086

• assert nested transactions

  mvorisek

  committed
  d48a037

Commits on Jan 12, 2022

• Merge branch 'model_in_model' into feature/introduce-aggregate-model

  mvorisek

  committed
  e572ff6

• Merge branch 'model_in_model' into feature/introduce-aggregate-union-models

  mvorisek

  committed
  5fe3df9

• Merge branch 'feature/introduce-aggregate-model' into feature/introduce-aggregate-union-models

  mvorisek

  committed
  23a33c4

• Merge branch 'develop' into feature/introduce-aggregate-model

  mvorisek

  committed
  3f51e91

• Merge branch 'develop' into feature/introduce-aggregate-union-models

  mvorisek

  committed
  0cea47b

• Merge branch 'feature/introduce-aggregate-model' into feature/introduce-aggregate-union-models

  mvorisek

  committed
  e29bdee

Commits on Jan 19, 2022

• fixed mysql server 8.0.28 released

  mvorisek

  committed
  a96f9d8

Commits on Jan 21, 2022

• Merge branch 'develop' into feature/introduce-aggregate-model

  mvorisek

  committed
  755bf26

• Merge branch 'develop' into feature/introduce-aggregate-union-models

  mvorisek

  committed
  0e315a2

• Merge branch 'feature/introduce-aggregate-model' into feature/introduce-aggregate-union-models

  mvorisek

  committed
  8be423b

Commits on Jan 23, 2022

• Merge branch 'develop' into feature/introduce-aggregate-model

  mvorisek

  committed
  081f694

• drop withAggregateField method

  mvorisek

  committed
  f451c5c

• drop AggregatesTrait trait

  mvorisek

  committed
  e9edb8b

Commits on Jan 30, 2022

• Merge branch 'develop' into feature/introduce-aggregate-model

  mvorisek

  committed
  fcbb43c

• rename Aggregate to AggregateModel

  mvorisek

  committed
  254bb67

• Merge branch 'develop' into feature/introduce-aggregate-union-models

  mvorisek

  committed
  d82ff1f

• Merge branch 'feature/introduce-aggregate-model' into feature/introduce-aggregate-union-models

  mvorisek

  committed
  6492e17

• fix merge

  mvorisek

  committed
  37fffd7

• rename Union to UnionModel

  mvorisek

  committed
  91db9f8

• DEBUG add infinite recursion detection

  mvorisek

  committed
  2a4f6df

• drop wrong union grouping pushdown

  mvorisek

  committed
  4d827b8

• fix doc

  mvorisek

  committed
  cdbd07a

• rename groupBy to setGroupBy as it mutates the model

  mvorisek

  committed
  da5856f

• Merge branch 'feature/introduce-aggregate-model' into feature/introduce-aggregate-union-models

  mvorisek

  committed
  c24d974

Commits on Mar 13, 2022

• Merge branch 'develop' into feature/introduce-aggregate-model

  mvorisek

  committed
  25c92cb

• Merge branch 'develop' into feature/introduce-aggregate-union-models

  mvorisek

  committed
  335f261

Commits on Mar 14, 2022

• adjust to latest develop

  mvorisek

  committed
  3db6a8a

• Merge branch 'feature/introduce-aggregate-model' into feature/introduce-aggregate-union-models

  mvorisek

  committed
  3a020b6

• adjust to latest develop

  mvorisek

  committed
  485d1ef

Commits on Apr 15, 2022

• Merge branch 'develop' into feature/introduce-aggregate-model

  mvorisek

  committed
  9349c88

• Merge branch 'develop' into feature/introduce-aggregate-union-models

  mvorisek

  committed
  fc69c68

• adjust to latest develop

  mvorisek

  committed
  e2cd2e2

• simplify

  mvorisek

  committed
  8ae2036

• fix cloned field - we should either disallow refs or wrap twice

  mvorisek

  committed
  9c9fa6f

• compact assertSameExportUnordered assertions

  mvorisek

  committed
  2da2f6a

• fix array merge

  mvorisek

  committed
  07d1838

• fix count query

  mvorisek

  committed
  5d8ee39

• no false for initQueryFields

  mvorisek

  committed
  431da2e

• fix cloned field - we should either disallow refs or wrap twice

  mvorisek

  committed
  1a821a8

• fix ii - do not clone field

  mvorisek

  committed
  8e8bfd5

• Merge branch 'feature/introduce-aggregate-model' into feature/introduce-aggregate-union-models

  mvorisek

  committed
  ffd69fd

• Merge branch 'feature/introduce-aggregate-model' into feature/introduce-aggregate-union-models

  mvorisek

  committed
  e36543d

• fix merge - no false for initQueryFields

  mvorisek

  committed
  3716814

• fix unaggregated fields for pgsql

  mvorisek

  committed
  a46433d

• Merge branch 'feature/introduce-aggregate-model' into feature/introduce-aggregate-union-models

  mvorisek

  committed
  27a9ced

• fix unaggregated fields for pgsql

  mvorisek

  committed
  265958f

• compact test code

  mvorisek

  committed
  95af333

• Merge branch 'feature/introduce-aggregate-model' into feature/introduce-aggregate-union-models

  mvorisek

  committed
  d4063b3

• compact test code

  mvorisek

  committed
  f8a2653

• skip unsupported sql tests

  mvorisek

  committed
  b4aa593

• compact test code

  mvorisek

  committed
  222724a

• rm ReportTest - same as ModelAggregateTest::testGroupLimit2

  mvorisek

  committed
  d57af82

• rename hook const

  mvorisek

  committed
  5520638

• fix cs

  mvorisek

  committed
  c6c8921

• rename hook const

  mvorisek

  committed
  c966abe

• Merge branch 'feature/introduce-aggregate-model' into feature/introduce-aggregate-union-models

  mvorisek

  committed
  c424234

• Merge branch 'develop' into feature/introduce-aggregate-union-models

  mvorisek

  committed
  6dd0eb2

• rm link to archived reports repo from README

  mvorisek

  committed
  26d4b26

• rm debug recursion detection

  mvorisek

  committed
  002665a

• rm pushdown note, it was wrong

  mvorisek

  committed
  63c53cb

Commits on Apr 16, 2022

• comments cleanup

  mvorisek

  committed
  af7bba4

Commits on Apr 21, 2022

• Merge branch 'develop' into feature/introduce-aggregate-union-models

  mvorisek

  committed
  1bb383b

• Merge branch 'develop' into feature/introduce-aggregate-union-models

  mvorisek

  committed
  3c12605

Commits on Apr 24, 2022

• Merge branch 'develop' into feature/introduce-aggregate-union-models

  mvorisek

  committed
  b65a109

Commits on May 9, 2022

• Merge branch 'develop' into feature/introduce-aggregate-union-models

  mvorisek

  committed
  b1d090f

Commits on Jun 25, 2022

• Merge branch 'develop' into feature/introduce-aggregate-union-models

  mvorisek

  committed
  4eeaaf8

Commits on Aug 12, 2023

• Merge branch 'develop' into feature/introduce-aggregate-union-models

  mvorisek

  committed
  98b1f70

• WIP convert rst to md

  mvorisek

  committed
  77b11d8

• fix cs

  mvorisek

  committed
  f3b910a

• fix merge

  mvorisek

  committed
  f9ee26f

• fix merge II

  mvorisek

  committed
  639bdb4

• WIP comment out failing test

  mvorisek

  committed
  bd15f65

• fix cs

  mvorisek

  committed
  8884678

• convert rst to md

  mvorisek

  committed
  d4c6fa6

Commits on Feb 1, 2024

• Merge branch 'develop'

  mvorisek

  committed
  e8ff052

• fix stan

  mvorisek

  committed
  48117ac

Commits on Feb 2, 2024

• Merge branch 'develop'

  mvorisek

  committed
  01d93b6

• fix test /w reference and has many

  mvorisek

  committed
  a53543a

Commits on Feb 3, 2024

• uncomment remaining test

  mvorisek

  committed
  d2f626d

• improve coverage

  mvorisek

  committed
  c8646b8

• prevent child models mutation

  mvorisek

  committed
  c84cfc6

Commits on Feb 4, 2024

• Merge branch 'develop'

  mvorisek

  committed
  8c7921e

Commits on Feb 20, 2024

• Merge branch 'develop'

  mvorisek

  committed
  06f309c

Commits on Feb 21, 2024

• Merge branch 'develop'

  mvorisek

  committed
  6a5f2b8

• do no wrap inner from in extra select

  mvorisek

  committed
  a82a108

• rm UnionModel::createSubAction() method

  mvorisek

  committed
  b4fbe57

• improve subQuery case

  mvorisek

  committed
  1c8abad

Commits on Feb 23, 2024

• Merge branch 'develop'

  mvorisek

  committed
  0cc8f36

Commits on Feb 26, 2024

• Merge branch 'develop'

  mvorisek

  committed
  9c0385f

Commits on Mar 16, 2024

• Merge branch 'develop'

  mvorisek

  committed
  3eb55af

• adjust for latest atk4/data

  mvorisek

  committed
  d17f009

Commits on Mar 17, 2024

• fix cs

  mvorisek

  committed
  62affa7

• fix typo

  mvorisek

  committed
  33fb29d

Commits on Mar 18, 2024

• fix variable names in docs

  DarkSide666

  committed
  0b85726

Commits on May 4, 2024

• Merge branch 'develop'

  mvorisek

  committed
  26cfd6f

• fix cs

  mvorisek

  committed
  f35f810

Commits on Jun 8, 2024

• Merge branch 'develop'

  mvorisek

  committed
  526adae

• improve phpstan ignores

  mvorisek

  committed
  5676f2f