 Roland Praml
|
1263f0f049
|
Merge remote-tracking branch 'ebean/master' into feature/platform-dependent-annotations
# Conflicts:
# src/main/java/com/avaje/ebean/annotation/Formula.java
# src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationParser.java
|
2016-11-17 13:31:22 +01:00 |
|
|
Rob Bygrave
|
6ca5ec986c
|
#881 - Split DocPropertyType.STRING into KEYWORD and TEXT ... for ElasticSearch 5.x support
|
2016-11-17 23:31:43 +13:00 |
|
|
Rob Bygrave
|
4159af9002
|
No effective change - logback-test.xml
|
2016-11-17 23:00:14 +13:00 |
|
|
Rob Bygrave
|
b0dae02c42
|
#881 - Split DocPropertyType.STRING into KEYWORD and TEXT ... for ElasticSearch 5.x support
|
2016-11-17 22:59:50 +13:00 |
|
|
Rob Bygrave
|
0322b37ae7
|
no effective change - format test code
|
2016-11-17 20:17:46 +13:00 |
|
|
Rob Bygrave
|
58760fe001
|
no effective change - format test code
|
2016-11-17 20:17:21 +13:00 |
|
|
Rob Bygrave
|
99f3bc8c54
|
no effective change - format and javadoc
|
2016-11-17 20:14:35 +13:00 |
|
|
Rob Bygrave
|
d3bf219129
|
no effective change - format
|
2016-11-17 20:06:58 +13:00 |
|
|
Rob Bygrave
|
57813179b2
|
no effective change - format
|
2016-11-17 20:05:04 +13:00 |
|
|
Rob Bygrave
|
c410700433
|
no effective change - format
|
2016-11-17 20:00:01 +13:00 |
|
|
Rob Bygrave
|
697e4dd0da
|
no effective change - format and javadoc
|
2016-11-17 19:58:37 +13:00 |
|
|
Rob Bygrave
|
60dfe6308e
|
no effective change - format and javadoc
|
2016-11-17 19:54:54 +13:00 |
|
|
Rob Bygrave
|
002d7d9f27
|
no effective change - format only
|
2016-11-17 19:24:38 +13:00 |
|
|
Rob Bygrave
|
2dceccfa78
|
no effective change - format only
|
2016-11-17 19:22:58 +13:00 |
|
|
Rob Bygrave
|
5cf9d14237
|
no effective change - format only
|
2016-11-17 19:21:17 +13:00 |
|
|
Rob Bygrave
|
bdd4370fe3
|
no effective change - format only
|
2016-11-17 19:17:34 +13:00 |
|
|
Rob Bygrave
|
63b08af3d2
|
no effective change - format only
|
2016-11-17 19:14:02 +13:00 |
|
|
Rob Bygrave
|
983306ed86
|
no effective change - format only
|
2016-11-17 19:11:28 +13:00 |
|
|
Rob Bygrave
|
15973c8992
|
no effective change - format only
|
2016-11-17 19:10:02 +13:00 |
|
|
Rob Bygrave
|
b49a52057a
|
no effective change - format only
|
2016-11-17 19:07:23 +13:00 |
|
|
Rob Bygrave
|
82151872fd
|
no effective change - format only
|
2016-11-17 19:06:26 +13:00 |
|
|
Rob Bygrave
|
709d4151f2
|
no effective change - format only
|
2016-11-17 17:21:25 +13:00 |
|
|
Rob Bygrave
|
d8e3f127c0
|
no effective change - reduce access to AbstractBeanCollection
|
2016-11-17 17:20:27 +13:00 |
|
|
Rob Bygrave
|
f4e422a239
|
no effective change - formatting only
|
2016-11-17 17:15:49 +13:00 |
|
|
Rob Bygrave
|
442f24124c
|
#879 - Ebean not fetching complete list of attribute beans when equals(Object o) is implemented
|
2016-11-17 17:15:14 +13:00 |
|
|
Rob Bygrave
|
259814f4d9
|
#849 - AbstractNamingConvention.getTableName inheritance logic differs from InheritInfo
|
2016-11-16 21:57:38 +13:00 |
|
|
Rob BygraveandGitHub
|
41a860ebb9
|
Merge pull request #874 from FOCONIS/feature/inheritance
Feature/inheritance
|
2016-11-16 21:14:41 +13:00 |
|
|
Roland Praml
|
0f3f79ab2c
|
ADD @OrderBy to fix Postgres-tests
|
2016-11-15 12:03:25 +01:00 |
|
|
Rob Bygrave
|
de9576835c
|
#872 - test models for DDL check constraint issue (not reproduced)
|
2016-11-15 23:27:08 +13:00 |
|
|
Roland Praml
|
7e7951df09
|
ADD @OrderBy to fix Postgres-tests
|
2016-11-15 11:15:54 +01:00 |
|
|
Rob Bygrave
|
632cf10096
|
#878 - @AttributeOverride (not wrapped in @AttributeOverrides) is not applied
|
2016-11-15 22:48:36 +13:00 |
|
|
Rob Bygrave
|
d2b6d06da5
|
Merge branch 'master' of github.com:ebean-orm/ebean
|
2016-11-15 22:13:09 +13:00 |
|
|
Rob Bygrave
|
b41f3e9d1f
|
#877 - DBMigration Generates wrong ddl for UUID type
|
2016-11-15 22:12:54 +13:00 |
|
|
Rob BygraveandGitHub
|
8357d9c7e7
|
Merge pull request #876 from ksperling/batching-exception-safety
Batching exception safety: Fix test
|
2016-11-14 15:28:36 +13:00 |
|
|
Karsten Sperling
|
97f1834c4d
|
Batching exception safety: Update test to reflect real world scenario more closely (and actually fail before the change)
|
2016-11-14 12:48:58 +13:00 |
|
|
Rob Bygrave
|
01f551a951
|
#875 - Changes to support ElasticSearch 5.x
|
2016-11-12 01:05:13 +13:00 |
|
|
Rob Bygrave
|
482d454fc3
|
#875 - Changes to support ElasticSearch 5.x
|
2016-11-11 23:43:13 +13:00 |
|
|
Roland Praml
|
7341f742de
|
ADD missing join in test
|
2016-11-11 10:08:08 +01:00 |
|
|
Roland Praml
|
ffb2d6a10c
|
Merge remote-tracking branch 'ebean/master' into feature/inheritance
|
2016-11-11 09:57:50 +01:00 |
|
|
Roland Praml
|
56c96923c4
|
extended the test cases
|
2016-11-11 09:57:13 +01:00 |
|
|
Roland Praml
|
e4e850717d
|
FIX: @Formula: support for discriminator & joins added
|
2016-11-11 09:57:02 +01:00 |
|
|
Rob Bygrave
|
5c142a61f6
|
No effective change - add javadoc
|
2016-11-11 17:11:15 +13:00 |
|
|
Roland Praml
|
019fdd3a12
|
fix test
|
2016-11-09 16:31:26 +01:00 |
|
|
Roland Praml
|
119edbdb9d
|
FIX: Missing comma in bindlog
|
2016-11-09 16:16:53 +01:00 |
|
|
Roland Praml
|
e8237cc04f
|
ENH: Support for @Formula in combination with @ManyToOne
|
2016-11-09 16:15:59 +01:00 |
|
|
Roland Praml
|
95ee163d8b
|
extended test cases
|
2016-11-09 15:56:55 +01:00 |
|
|
Roland Praml
|
9a22f9735a
|
no ebean code change: extended test case to use a bean in @Formula and return ID
|
2016-11-09 10:26:37 +01:00 |
|
|
Roland Praml
|
29dbd5ac5d
|
No effective code change - add unit test to demonstrate inheritance use case
|
2016-11-09 10:11:00 +01:00 |
|
|
Karsten Sperling
|
8661e1fd3f
|
Reset batch on rollback
|
2016-11-09 10:58:57 +13:00 |
|
|
Karsten Sperling
|
9569b1b0d5
|
Added test for exception safety when using batchOnCascade
|
2016-11-09 10:58:57 +13:00 |
|