You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polygene.apache.org by pa...@apache.org on 2016/10/24 11:41:18 UTC

[1/3] zest-java git commit: SQL ES: fix MySQL test jdbc url for new drivers

Repository: zest-java
Updated Branches:
  refs/heads/develop c714084fc -> 520aa5f38


SQL ES: fix MySQL test jdbc url for new drivers


Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/47837db3
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/47837db3
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/47837db3

Branch: refs/heads/develop
Commit: 47837db306074687a948d8bb2c0660539ee2bdca
Parents: c714084
Author: Paul Merlin <pa...@apache.org>
Authored: Mon Oct 24 13:32:16 2016 +0200
Committer: Paul Merlin <pa...@apache.org>
Committed: Mon Oct 24 13:32:16 2016 +0200

----------------------------------------------------------------------
 .../entitystore-sql/src/test/resources/mysql-datasource.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zest-java/blob/47837db3/extensions/entitystore-sql/src/test/resources/mysql-datasource.properties
----------------------------------------------------------------------
diff --git a/extensions/entitystore-sql/src/test/resources/mysql-datasource.properties b/extensions/entitystore-sql/src/test/resources/mysql-datasource.properties
index a5080ce..b6c57cb 100644
--- a/extensions/entitystore-sql/src/test/resources/mysql-datasource.properties
+++ b/extensions/entitystore-sql/src/test/resources/mysql-datasource.properties
@@ -19,7 +19,7 @@
 #
 
 enabled=true
-url=jdbc:mysql://localhost:3306/jdbc_test_db?profileSQL=true
+url=jdbc:mysql://localhost:3306/jdbc_test_db?profileSQL=true&useLegacyDatetimeCode=false&serverTimezone=UTC
 driver=com.mysql.jdbc.Driver
 username=root
 password=


Re: [3/3] zest-java git commit: ZEST-180 Indexing-SQL uses the String form of Identity

Posted by Niclas Hedhman <ni...@hedhman.org>.
Never mind,,, OUTSIDE the get().

On Mon, Oct 24, 2016 at 8:16 PM, Niclas Hedhman <ni...@hedhman.org> wrote:

> Hold on, what is this?? UnitOfWork.get() takes an Identity instance, not a
> string.
>
> On Mon, Oct 24, 2016 at 7:41 PM, <pa...@apache.org> wrote:
>
>> ZEST-180 Indexing-SQL uses the String form of Identity
>>
>> Most of the tests still fail after the refactoring.
>>
>>
>> Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
>> Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/520aa5f3
>> Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/520aa5f3
>> Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/520aa5f3
>>
>> Branch: refs/heads/develop
>> Commit: 520aa5f38acc86cf8631e8a866e6cf844008d72c
>> Parents: 23f6bc1
>> Author: Paul Merlin <pa...@apache.org>
>> Authored: Mon Oct 24 13:40:49 2016 +0200
>> Committer: Paul Merlin <pa...@apache.org>
>> Committed: Mon Oct 24 13:40:49 2016 +0200
>>
>> ----------------------------------------------------------------------
>>  .../zest/index/sql/support/skeletons/AbstractSQLQuerying.java      | 2
>> +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>> ----------------------------------------------------------------------
>>
>>
>> http://git-wip-us.apache.org/repos/asf/zest-java/blob/520aa5
>> f3/extensions/indexing-sql/src/main/java/org/apache/zest/
>> index/sql/support/skeletons/AbstractSQLQuerying.java
>> ----------------------------------------------------------------------
>> diff --git a/extensions/indexing-sql/src/main/java/org/apache/zest/inde
>> x/sql/support/skeletons/AbstractSQLQuerying.java
>> b/extensions/indexing-sql/src/main/java/org/apache/zest/inde
>> x/sql/support/skeletons/AbstractSQLQuerying.java
>> index c6cc0d6..38ba1f8 100644
>> --- a/extensions/indexing-sql/src/main/java/org/apache/zest/inde
>> x/sql/support/skeletons/AbstractSQLQuerying.java
>> +++ b/extensions/indexing-sql/src/main/java/org/apache/zest/inde
>> x/sql/support/skeletons/AbstractSQLQuerying.java
>> @@ -1055,7 +1055,7 @@ public abstract class AbstractSQLQuerying
>>                      if( value instanceof EntityComposite )
>>                      {
>>                          value = uowf.currentUnitOfWork().get(
>> -                            (EntityComposite) value ).identity().get();
>> +                            (EntityComposite) value
>> ).identity().get().toString();
>>                      }
>>                      else
>>                      {
>>
>>
>
>
> --
> Niclas Hedhman, Software Developer
> http://zest.apache.org - New Energy for Java
>



-- 
Niclas Hedhman, Software Developer
http://zest.apache.org - New Energy for Java

Re: [3/3] zest-java git commit: ZEST-180 Indexing-SQL uses the String form of Identity

Posted by Niclas Hedhman <ni...@hedhman.org>.
Hold on, what is this?? UnitOfWork.get() takes an Identity instance, not a
string.

On Mon, Oct 24, 2016 at 7:41 PM, <pa...@apache.org> wrote:

> ZEST-180 Indexing-SQL uses the String form of Identity
>
> Most of the tests still fail after the refactoring.
>
>
> Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
> Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/520aa5f3
> Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/520aa5f3
> Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/520aa5f3
>
> Branch: refs/heads/develop
> Commit: 520aa5f38acc86cf8631e8a866e6cf844008d72c
> Parents: 23f6bc1
> Author: Paul Merlin <pa...@apache.org>
> Authored: Mon Oct 24 13:40:49 2016 +0200
> Committer: Paul Merlin <pa...@apache.org>
> Committed: Mon Oct 24 13:40:49 2016 +0200
>
> ----------------------------------------------------------------------
>  .../zest/index/sql/support/skeletons/AbstractSQLQuerying.java      | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/zest-java/blob/
> 520aa5f3/extensions/indexing-sql/src/main/java/org/apache/
> zest/index/sql/support/skeletons/AbstractSQLQuerying.java
> ----------------------------------------------------------------------
> diff --git a/extensions/indexing-sql/src/main/java/org/apache/zest/
> index/sql/support/skeletons/AbstractSQLQuerying.java
> b/extensions/indexing-sql/src/main/java/org/apache/zest/
> index/sql/support/skeletons/AbstractSQLQuerying.java
> index c6cc0d6..38ba1f8 100644
> --- a/extensions/indexing-sql/src/main/java/org/apache/zest/
> index/sql/support/skeletons/AbstractSQLQuerying.java
> +++ b/extensions/indexing-sql/src/main/java/org/apache/zest/
> index/sql/support/skeletons/AbstractSQLQuerying.java
> @@ -1055,7 +1055,7 @@ public abstract class AbstractSQLQuerying
>                      if( value instanceof EntityComposite )
>                      {
>                          value = uowf.currentUnitOfWork().get(
> -                            (EntityComposite) value ).identity().get();
> +                            (EntityComposite) value
> ).identity().get().toString();
>                      }
>                      else
>                      {
>
>


-- 
Niclas Hedhman, Software Developer
http://zest.apache.org - New Energy for Java

[3/3] zest-java git commit: ZEST-180 Indexing-SQL uses the String form of Identity

Posted by pa...@apache.org.
ZEST-180 Indexing-SQL uses the String form of Identity

Most of the tests still fail after the refactoring.


Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/520aa5f3
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/520aa5f3
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/520aa5f3

Branch: refs/heads/develop
Commit: 520aa5f38acc86cf8631e8a866e6cf844008d72c
Parents: 23f6bc1
Author: Paul Merlin <pa...@apache.org>
Authored: Mon Oct 24 13:40:49 2016 +0200
Committer: Paul Merlin <pa...@apache.org>
Committed: Mon Oct 24 13:40:49 2016 +0200

----------------------------------------------------------------------
 .../zest/index/sql/support/skeletons/AbstractSQLQuerying.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zest-java/blob/520aa5f3/extensions/indexing-sql/src/main/java/org/apache/zest/index/sql/support/skeletons/AbstractSQLQuerying.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-sql/src/main/java/org/apache/zest/index/sql/support/skeletons/AbstractSQLQuerying.java b/extensions/indexing-sql/src/main/java/org/apache/zest/index/sql/support/skeletons/AbstractSQLQuerying.java
index c6cc0d6..38ba1f8 100644
--- a/extensions/indexing-sql/src/main/java/org/apache/zest/index/sql/support/skeletons/AbstractSQLQuerying.java
+++ b/extensions/indexing-sql/src/main/java/org/apache/zest/index/sql/support/skeletons/AbstractSQLQuerying.java
@@ -1055,7 +1055,7 @@ public abstract class AbstractSQLQuerying
                     if( value instanceof EntityComposite )
                     {
                         value = uowf.currentUnitOfWork().get(
-                            (EntityComposite) value ).identity().get();
+                            (EntityComposite) value ).identity().get().toString();
                     }
                     else
                     {


[2/3] zest-java git commit: SQL ES: better document test setup

Posted by pa...@apache.org.
SQL ES: better document test setup


Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/23f6bc16
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/23f6bc16
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/23f6bc16

Branch: refs/heads/develop
Commit: 23f6bc16da1d46ddfcb474c927b248a15d166e14
Parents: 47837db
Author: Paul Merlin <pa...@apache.org>
Authored: Mon Oct 24 13:32:44 2016 +0200
Committer: Paul Merlin <pa...@apache.org>
Committed: Mon Oct 24 13:32:44 2016 +0200

----------------------------------------------------------------------
 .../zest/entitystore/sql/PostgreSQLEntityStoreTest.java | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zest-java/blob/23f6bc16/extensions/entitystore-sql/src/test/java/org/apache/zest/entitystore/sql/PostgreSQLEntityStoreTest.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-sql/src/test/java/org/apache/zest/entitystore/sql/PostgreSQLEntityStoreTest.java b/extensions/entitystore-sql/src/test/java/org/apache/zest/entitystore/sql/PostgreSQLEntityStoreTest.java
index f54b48b..9b9c915 100644
--- a/extensions/entitystore-sql/src/test/java/org/apache/zest/entitystore/sql/PostgreSQLEntityStoreTest.java
+++ b/extensions/entitystore-sql/src/test/java/org/apache/zest/entitystore/sql/PostgreSQLEntityStoreTest.java
@@ -47,11 +47,17 @@ import static org.apache.zest.test.util.Assume.assumeConnectivity;
  *
  * Use 'password' as password for the jdbc_test_login user.
  *
+ * Eventually create a database cluster:
+ *
+ * <pre>
+ * initdb -D /usr/local/pgsql/data
+ * </pre>
+ *
+ * Start PostgreSQL. Then, create test user and database:
+ *
  * <pre>
  * createuser -A -D -P -E -W jdbc_test_login
  * createdb -O jdbc_test_login -W jdbc_test_db
- * psql -d jdbc_testdb
- * CREATE EXTENSION ltree;
  * </pre>
  *
  * To clear the data:
@@ -59,8 +65,6 @@ import static org.apache.zest.test.util.Assume.assumeConnectivity;
  * <pre>
  * dropdb -W jdbc_test_db
  * createdb -O jdbc_test_login -W jdbc_test_db
- * psql -d jdbc_test_db
- * CREATE EXTENSION ltree;
  * </pre>
  *
  * To remove the test user: