You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@metamodel.apache.org by kaspersorensen <gi...@git.apache.org> on 2017/08/30 04:39:22 UTC
[GitHub] metamodel pull request #160: METAMODEL-1160 and METAMODEL-1163: Fixed
GitHub user kaspersorensen opened a pull request:
https://github.com/apache/metamodel/pull/160
METAMODEL-1160 and METAMODEL-1163: Fixed
Re-did the same changes as in #159 but this time without all the reformatting of complete classes :-)
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/kaspersorensen/metamodel METAMODEL-1160-and-1163
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/metamodel/pull/160.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #160
----
commit eb603e80936af64717f8631c6b5a28c60d32002c
Author: Kasper Sørensen <i....@gmail.com>
Date: 2017-08-30T04:37:51Z
METAMODEL-1160 and METAMODEL-1163: Fixed
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] metamodel pull request #160: METAMODEL-1160 and METAMODEL-1163: Fixed
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/metamodel/pull/160
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] metamodel pull request #160: METAMODEL-1160 and METAMODEL-1163: Fixed
Posted by LosD <gi...@git.apache.org>.
Github user LosD commented on a diff in the pull request:
https://github.com/apache/metamodel/pull/160#discussion_r135997623
--- Diff: core/src/main/java/org/apache/metamodel/schema/MutableRelationship.java ---
@@ -134,4 +139,17 @@ private MutableRelationship(List<Column> primaryColumns, List<Column> foreignCol
return _foreignColumns;
}
+ private void readObject(ObjectInputStream stream) throws IOException, ClassNotFoundException {
+ final GetField getFields = stream.readFields();
+ Object primaryColumns = getFields.get("_primaryColumns", null);
+ Object foreignColumns = getFields.get("_foreignColumns", null);
+ if (primaryColumns instanceof Column[] && foreignColumns instanceof Column[]) {
--- End diff --
Are these always tied together, or could one be an array and the other not?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] metamodel pull request #160: METAMODEL-1160 and METAMODEL-1163: Fixed
Posted by LosD <gi...@git.apache.org>.
Github user LosD commented on a diff in the pull request:
https://github.com/apache/metamodel/pull/160#discussion_r136401855
--- Diff: core/src/main/java/org/apache/metamodel/schema/MutableRelationship.java ---
@@ -134,4 +139,17 @@ private MutableRelationship(List<Column> primaryColumns, List<Column> foreignCol
return _foreignColumns;
}
+ private void readObject(ObjectInputStream stream) throws IOException, ClassNotFoundException {
+ final GetField getFields = stream.readFields();
+ Object primaryColumns = getFields.get("_primaryColumns", null);
+ Object foreignColumns = getFields.get("_foreignColumns", null);
+ if (primaryColumns instanceof Column[] && foreignColumns instanceof Column[]) {
--- End diff --
In that case, LGTM! I'll merge
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] metamodel pull request #160: METAMODEL-1160 and METAMODEL-1163: Fixed
Posted by kaspersorensen <gi...@git.apache.org>.
Github user kaspersorensen commented on a diff in the pull request:
https://github.com/apache/metamodel/pull/160#discussion_r136374486
--- Diff: core/src/main/java/org/apache/metamodel/schema/MutableRelationship.java ---
@@ -134,4 +139,17 @@ private MutableRelationship(List<Column> primaryColumns, List<Column> foreignCol
return _foreignColumns;
}
+ private void readObject(ObjectInputStream stream) throws IOException, ClassNotFoundException {
+ final GetField getFields = stream.readFields();
+ Object primaryColumns = getFields.get("_primaryColumns", null);
+ Object foreignColumns = getFields.get("_foreignColumns", null);
+ if (primaryColumns instanceof Column[] && foreignColumns instanceof Column[]) {
--- End diff --
In our history it has only been either-or. Of course someone (slightly crazy) could of course change one of them back to an array and then we'd have an interesting new issue to work on :-) But I argue that the only scenario worth worrying about now is that it's the singular "old class format" where they both where arrays.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---