Commit Graph
5249 Commits
Author SHA1 Message Date
Noemi Szemenyei 5dc98359e3 [maven-release-plugin] prepare release ebean-parent-12.13.1-FOC2 2021-11-22 08:48:17 +01:00
Noemi Szemenyei ba80ae20f4 NPE Fix with .setCountDistinct(CountDistinctOrder.NO_ORDERING) 2021-11-22 08:30:50 +01:00
Noemi Szemenyei 6ea8f5c12b Merge branch 'master' of https://github.com/ebean-orm/ebean into ebean-new
# Conflicts:
#	ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
#	ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefInherit.java
#	ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
#	ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParser.java
2021-11-22 08:07:30 +01:00
Rob Bygrave 86d805c9fa Tidy internals only for OrmQueryRequest after merge of #2442 2021-11-22 15:21:03 +13:00
Rob BygraveandGitHub 34135360ed Merge pull request #2442 from FOCONIS/findmap-with-beancache-without-mapkey
findMap() with beanCache should use idPoperty if mapKey = null
2021-11-22 15:15:07 +13:00
Rob Bygrave 53b4d6fd73 Merge branch 'FOCONIS-assume-infoInherit-infoType-without-children' 2021-11-22 15:12:29 +13:00
Rob Bygrave 1114ccfb3a #2441 Flatten and re-order if block in AssocOneHelpRefInherit when determining BeanDescriptor 2021-11-22 15:12:18 +13:00
Rob Bygrave b4403c58d1 Merge branch 'assume-infoInherit-infoType-without-children' of https://github.com/FOCONIS/ebean into FOCONIS-assume-infoInherit-infoType-without-children 2021-11-22 15:06:34 +13:00
Rob Bygrave 951903db76 Merge branch 'FOCONIS-json-deserialize-references' 2021-11-22 15:00:14 +13:00
Rob Bygrave 093d111524 #2440 - Re-use existing referenceIdPropertyOnly() method 2021-11-22 14:59:40 +13:00
Rob Bygrave 08e166a9b7 Merge branch 'json-deserialize-references' of https://github.com/FOCONIS/ebean into FOCONIS-json-deserialize-references 2021-11-22 14:51:21 +13:00
Rob Bygrave d5fe7a9ebe Whitespace format only - OrmQueryPropertiesParser 2021-11-22 10:23:27 +13:00
Rob BygraveandGitHub 9f52856343 Merge pull request #2439 from FOCONIS/path-properties-query-with-all-props
Path properties query with all props
2021-11-22 09:15:08 +13:00
Rob BygraveandGitHub 0b529603c4 Merge pull request #2438 from FOCONIS/type-get-all-for-repeated-annotations
FIX: typeGetAll did not work with repeated annotations on one class
2021-11-22 09:01:06 +13:00
Jonas Pöhler 78681fdee8 Try and fix NPE in MigrationRunner, when DataSource is null 2021-11-19 17:56:58 +01:00
Noemi Szemenyei 60d0a3da39 findMap() with beanCache should use idPoperty if mapKey = null 2021-11-19 11:53:37 +01:00
Noemi Szemenyei 3efb552bd9 findMap() with beanCache should use idPoperty if mapKey = null 2021-11-19 11:50:45 +01:00
Noemi Szemenyei 74f49b388d MysqlGenerateMigrationTest disabled 2021-11-18 15:11:43 +01:00
Noemi Szemenyei 93eca06694 [maven-release-plugin] prepare for next development iteration 2021-11-18 08:09:05 +01:00
Noemi Szemenyei 3409fd98e1 [maven-release-plugin] prepare release ebean-parent-12.13.1-FOC1 2021-11-18 08:08:49 +01:00
Noemi Szemenyei b97d7b5028 subprojects with Foc-Versions 2021-11-17 17:30:44 +01:00
Noemi Szemenyei 1c224444c0 Assume InfoInherit infoType when it has no children 2021-11-16 13:44:53 +01:00
Jonas PöhlerandNoemi Szemenyei d3e07defa0 FIX: Json deserialize references 2021-11-16 11:57:30 +01:00
Noemi Szemenyei 1b5d379ed3 Fix for Query with PathProperties (*,x(y)) 2021-11-16 11:45:18 +01:00
Noemi Szemenyei b90393a691 Unittest for select Query with (*,x(y)) 2021-11-16 11:39:14 +01:00
Jonas PöhlerandNoemi Szemenyei 2d26740286 FIX: typeGetAll did not work with repeated annotations on one class 2021-11-16 11:24:22 +01:00
Jonas Pöhler 6eb13fda7a FIX: typeGetAll did not work with repeated annotations on one class 2021-11-12 17:29:10 +01:00
Jonas Pöhler f98292be41 ADD: metaHas and metaFindAll as functional sugar 2021-11-12 15:56:07 +01:00
Jonas Pöhler e7cffe99d6 FIX: Json deserialize references 2021-11-12 14:46:39 +01:00
Noemi Szemenyei 0dc2550bdb Assume InfoInherit infoType when it has no children 2021-11-12 10:40:15 +01:00
Noemi Szemenyei 6af2902ae3 Fix for select query with (*,x(y)) 2021-11-10 16:11:42 +01:00
Noemi Szemenyei abf311de93 Unittest for select Query with (*,x(y)) 2021-11-10 13:30:24 +01:00
Jonas Pöhler 85ec1d3d84 Fix PropertiesParser with "*,foo" 2021-11-05 11:40:58 +01:00
Jonas Pöhler afe98c6d90 Delete unused LoadErrorHandler.java 2021-11-04 16:39:43 +01:00
Jonas Pöhler 9e02a9bb3d WirteJson allow include identifier 2021-11-04 16:39:05 +01:00
Roland PramlandJonas Pöhler 04eda3eae2 FIX: Missing internalBatchFlush after TransactionCallback.preCommit 2021-11-04 13:32:07 +01:00
Jonas Pöhler 71b0416ddf FIX: version of annotations 2021-11-04 10:42:29 +01:00
Jonas Pöhler 13bc219fcb versions 2021-11-04 10:38:07 +01:00
Jonas Pöhler 0367ae2a8c Merge remote-tracking branch 'ebean/master' into ebean-new
# Conflicts:
#	ebean-api/pom.xml
#	ebean-autotune/pom.xml
#	ebean-bom/pom.xml
#	ebean-core-type/pom.xml
#	ebean-core/pom.xml
#	ebean-ddl-generator/pom.xml
#	ebean-externalmapping-api/pom.xml
#	ebean-externalmapping-xml/pom.xml
#	ebean-postgis/pom.xml
#	ebean-querybean/pom.xml
#	ebean-redis/pom.xml
#	ebean-test/pom.xml
#	ebean/pom.xml
#	kotlin-querybean-generator/pom.xml
#	pom.xml
#	querybean-generator/pom.xml
2021-11-04 10:33:04 +01:00
Jonas Pöhler cfa9a938fe Distribution management 2021-11-04 10:31:56 +01:00
Jonas Pöhler 296e5dec3e Fix tests (not very clean) 2021-11-04 10:24:46 +01:00
Jonas Pöhler e08043f3b2 Disable test 2021-11-04 09:50:43 +01:00
Rob Bygrave 5807874c9e [maven-release-plugin] prepare for next development iteration 2021-11-04 11:19:32 +13:00
Rob Bygrave ea7b4e8162 [maven-release-plugin] prepare release ebean-parent-12.13.0 ebean-parent-12.13.0 2021-11-04 11:19:25 +13:00
Rob Bygrave 43742fdc0b Bump version to 12.13.0-SNAPSHOT 2021-11-04 11:16:50 +13:00
Rob Bygrave 8ef71bd451 Bump version to 12.13.0-SNAPSHOT 2021-11-04 11:02:45 +13:00
Rob Bygrave 0f60e2240c Bump version to 12.13.0-SNAPSHOT 2021-11-04 10:57:48 +13:00
Rob Bygrave 2cbb161ed5 Follow up to #2437 - Rename internal "dead/alive" to "replaced" 2021-11-04 10:40:04 +13:00
Rob BygraveandGitHub a47caec85b Merge pull request #2437 from FOCONIS/fix-persistence-context
FIX: Subsequent findEach / findList does not work reliable [Fixes regression in 12.3.3]
2021-11-04 09:59:31 +13:00
Roland Praml fd1b5f58bc FIX: Subsequent findEach / findList does not work reliable (Regression of #2411) 2021-11-03 11:34:04 +01:00