View | Details | Raw Unified | Return to bug 317197 | Differences between
and this patch

Collapse All | Expand All

(-)jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/models/wdf/jpa1/employee/Employee.java (-3 / +4 lines)
Lines 152-158 Link Here
152
    // <join-column name="PROFILE_GUID"/>
152
    // <join-column name="PROFILE_GUID"/>
153
    // </attribute>
153
    // </attribute>
154
    @OneToOne
154
    @OneToOne
155
    @JoinColumn(name = "PROFILE_GUID")
155
    @JoinColumn(name = "PROFILE_GUID", columnDefinition="binary(16) DEFAULT NULL")
156
    protected TravelProfile travelProfile;
156
    protected TravelProfile travelProfile;
157
157
158
    // <attribute name="hobbies">
158
    // <attribute name="hobbies">
Lines 186-193 Link Here
186
    @JoinTable(name = "TMP_EMP_CREDIT", joinColumns = { @JoinColumn(name = "CLIENT_ID") }, inverseJoinColumns = { @JoinColumn(name = "CREDIT_ID") })
186
    @JoinTable(name = "TMP_EMP_CREDIT", joinColumns = { @JoinColumn(name = "CLIENT_ID") }, inverseJoinColumns = { @JoinColumn(name = "CREDIT_ID") })
187
    protected Set<CreditCardAccount> creditCardAccounts;
187
    protected Set<CreditCardAccount> creditCardAccounts;
188
188
189
    @OneToOne
189
//    @OneToOne
190
    @JoinColumn(name = "AUTOMOBILE")
190
//    @JoinColumn(name = "AUTOMOBILE")
191
    @Transient // EclipseLink has issue with cyclic FKs FIXME: file bug and add id here
191
    protected MotorVehicle automobile;
192
    protected MotorVehicle automobile;
192
193
193
    @ManyToOne
194
    @ManyToOne
(-)jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/models/wdf/jpa1/employee/TravelProfile.java (-1 / +1 lines)
Lines 86-92 Link Here
86
     * @return Returns the guid.
86
     * @return Returns the guid.
87
     */
87
     */
88
    @Id
88
    @Id
89
    @Column(length = 16)
89
    @Column(length = 16, columnDefinition="binary(16) DEFAULT NULL")
90
    public byte[] getGuid() {
90
    public byte[] getGuid() {
91
        return guid;
91
        return guid;
92
    }
92
    }
(-)jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/models/wdf/jpa1/employee/Vehicle.java (-1 / +2 lines)
Lines 59-66 Link Here
59
    int version;
59
    int version;
60
60
61
    @ManyToMany
61
    @ManyToMany
62
    @JoinTable(name = "TMP_VEHICLE_PROFILE", joinColumns = { @JoinColumn(name = "VEHICLE_ID") }, inverseJoinColumns = { @JoinColumn(name = "PROFILE_ID") })
62
    @JoinTable(name = "TMP_VEHICLE_PROFILE", joinColumns = { @JoinColumn(name = "VEHICLE_ID") }, inverseJoinColumns = { @JoinColumn(name = "PROFILE_ID", columnDefinition="binary(16) DEFAULT NULL") })
63
    private Set<TravelProfile> profiles;
63
    private Set<TravelProfile> profiles;
64
    
64
65
65
    public void setId(Short id) {
66
    public void setId(Short id) {
66
        this.id = id;
67
        this.id = id;
(-)jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/tests/wdf/jpa1/JPA1Base.java (-2 / +2 lines)
Lines 20-30 Link Here
20
public abstract class JPA1Base extends AbstractBaseTest {
20
public abstract class JPA1Base extends AbstractBaseTest {
21
21
22
    private static final String[] CLEARABLE_TABLE_NAMES = { "TMP_EMP_CREDIT", "TMP_CREDIT_ACC", "TMP_BROKER_ACC",
22
    private static final String[] CLEARABLE_TABLE_NAMES = { "TMP_EMP_CREDIT", "TMP_CREDIT_ACC", "TMP_BROKER_ACC",
23
            "TMP_SAVE_ACC", "TMP_MARGIN_ACC", "TMP_CHECK_ACC", "TMP_EMP_PROJECT", "TMP_DEP", "TMP_REVIEW_DETAILS",
23
            "TMP_SAVE_ACC", "TMP_MARGIN_ACC", "TMP_CHECK_ACC", "TMP_EMP_PROJECT", "TMP_REVIEW_DETAILS",
24
            "TMP_EMP_REVIEW", "TMP_BASIC_TYPES_FA", "TMP_TEMPORAL_FA", "TMP_BASIC_TYPES_PA", "TMP_NODE", "TMP_EMBEDD_FA",
24
            "TMP_EMP_REVIEW", "TMP_BASIC_TYPES_FA", "TMP_TEMPORAL_FA", "TMP_BASIC_TYPES_PA", "TMP_NODE", "TMP_EMBEDD_FA",
25
            "TMP_EMBEDD_PA", "TMP_ISLAND", "TMP_EMP_PATENT", "TMP_PROJECT_DETAILS", "TMP_PROFILE", "TMP_CASC_NODE",
25
            "TMP_EMBEDD_PA", "TMP_ISLAND", "TMP_EMP_PATENT", "TMP_PROJECT_DETAILS", "TMP_PROFILE", "TMP_CASC_NODE",
26
            "TMP_COURSE_EMP", "TMP_COURSE", "TMP_REVIEW", "TMP_PATENT", "TMP_CASC_NODE_DESC", "TMP_EMP_HOBBY", "TMP_HOBBY",
26
            "TMP_COURSE_EMP", "TMP_COURSE", "TMP_REVIEW", "TMP_PATENT", "TMP_CASC_NODE_DESC", "TMP_EMP_HOBBY", "TMP_HOBBY",
27
            "TMP_EMP_BICYCLE", "TMP_VEHICLE", "TMP_EMP", "TMP_OFFICE_CUBICLE", "TMP_OFFICE", "TMP_ALLRELATIONS", "TMP_CUBICLE",
27
            "TMP_EMP_BICYCLE", "TMP_VEHICLE", "TMP_EMP", "TMP_DEP", "TMP_OFFICE_CUBICLE", "TMP_OFFICE", "TMP_ALLRELATIONS", "TMP_CUBICLE",
28
            "TMP_ALLRELATIONS_LIST", "TMP_ALLRELATIONS_SET", "TMP_ALLRELATIONS_COLLECTION", "TMP_ALLRELATIONS_MAPID",
28
            "TMP_ALLRELATIONS_LIST", "TMP_ALLRELATIONS_SET", "TMP_ALLRELATIONS_COLLECTION", "TMP_ALLRELATIONS_MAPID",
29
            "TMP_ALLRELATIONS_MAPFIELD", "TMP_TASK", "TMP_PROJECT", "TMP_CITY", "TMP_CITY_TMP_COP", "TMP_CITY_TMP_CRIMINAL",
29
            "TMP_ALLRELATIONS_MAPFIELD", "TMP_TASK", "TMP_PROJECT", "TMP_CITY", "TMP_CITY_TMP_COP", "TMP_CITY_TMP_CRIMINAL",
30
            "TMP_COP", "TMP_COP_TMP_CRIMINAL", "TMP_COP_TMP_INFORMER", "TMP_CRIMINAL", "TMP_CRIMINAL_TMP_CRIMINAL",
30
            "TMP_COP", "TMP_COP_TMP_CRIMINAL", "TMP_COP_TMP_INFORMER", "TMP_CRIMINAL", "TMP_CRIMINAL_TMP_CRIMINAL",

Return to bug 317197