Index: test/sql/derby/datastoreidentity/schema.sql
===================================================================
--- test/sql/derby/datastoreidentity/schema.sql	(revision 345168)
+++ test/sql/derby/datastoreidentity/schema.sql	(working copy)
@@ -4528,14 +4528,12 @@
 CREATE TABLE SET_OF_OBJECT0
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE SET_OF_OBJECT1
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     ID BIGINT NOT NULL,
     INTVAL INTEGER NOT NULL,
     STRINGVAL VARCHAR(128) NOT NULL
@@ -4544,21 +4542,18 @@
 CREATE TABLE SET_OF_OBJECT2
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
 	COLLVAL LONG VARCHAR FOR BIT DATA
 );
 
 CREATE TABLE SET_OF_SIMPLE_CLASS3
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE SET_OF_SIMPLE_CLASS4
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     ID BIGINT NOT NULL,
     INTVAL INTEGER NOT NULL,
     STRINGVAL VARCHAR(128) NOT NULL
@@ -4567,21 +4562,18 @@
 CREATE TABLE SET_OF_SIMPLE_CLASS5
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
 	COLLVAL LONG VARCHAR FOR BIT DATA
 );
 
 CREATE TABLE SET_OF_SIMPLE_INTERFACE6
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE SET_OF_SIMPLE_INTERFACE7
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     ID BIGINT NOT NULL,
     INTVAL INTEGER NOT NULL,
     STRINGVAL VARCHAR(128) NOT NULL
@@ -4590,161 +4582,138 @@
 CREATE TABLE SET_OF_SIMPLE_INTERFACE8
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
 	COLLVAL LONG VARCHAR FOR BIT DATA
 );
 
 CREATE TABLE SET_OF_STRING9
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     STRINGVAL VARCHAR(1024)
 );
 
 CREATE TABLE SET_OF_STRING10
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     STRINGVAL VARCHAR(1024)
 );
 
 CREATE TABLE SET_OF_DATE12
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     DATEVAL TIMESTAMP
 );
 
 CREATE TABLE SET_OF_DATE13
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     DATEVAL TIMESTAMP
 );
 
 CREATE TABLE SET_OF_LOCALE15
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     LOCALEVAL CHAR(20)
 );
 
 CREATE TABLE SET_OF_LOCALE16
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     LOCALEVAL CHAR(20)
 );
 
 CREATE TABLE SET_OF_BIG_DECIMAL18
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     BIG_DECIMALVAL DECIMAL(27,16)
 );
 
 CREATE TABLE SET_OF_BIG_DECIMAL19
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     BIG_DECIMALVAL DECIMAL(27,16)
 );
 
 CREATE TABLE SET_OF_BIG_INTEGER21
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     BIG_INTEGERVAL BIGINT
 );
 
 CREATE TABLE SET_OF_BIG_INTEGER22
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     BIG_INTEGERVAL BIGINT
 );
 
 CREATE TABLE SET_OF_BYTE24
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     BYTEVAL SMALLINT
 );
 
 CREATE TABLE SET_OF_BYTE25
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     BYTEVAL SMALLINT
 );
 
 CREATE TABLE SET_OF_DOUBLE27
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     DOUBLEVAL DOUBLE
 );
 
 CREATE TABLE SET_OF_DOUBLE28
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     DOUBLEVAL DOUBLE
 );
 
 CREATE TABLE SET_OF_FLOAT30
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     FLOATVAL FLOAT
 );
 
 CREATE TABLE SET_OF_FLOAT31
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     FLOATVAL FLOAT
 );
 
 CREATE TABLE SET_OF_INTEGER33
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     INTEGERVAL INTEGER
 );
 
 CREATE TABLE SET_OF_INTEGER34
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     INTEGERVAL INTEGER
 );
 
 CREATE TABLE SET_OF_LONG36
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     LONGVAL BIGINT
 );
 
 CREATE TABLE SET_OF_LONG37
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     LONGVAL BIGINT
 );
 
 CREATE TABLE SET_OF_SHORT39
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     SHORTVAL SMALLINT
 );
 
 CREATE TABLE SET_OF_SHORT40
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     SHORTVAL SMALLINT
 );
 
@@ -4772,14 +4741,12 @@
 CREATE TABLE HASHSET_OF_OBJECT0
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHSET_OF_OBJECT1
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     ID BIGINT NOT NULL,
     INTVAL INTEGER NOT NULL,
     STRINGVAL VARCHAR(128) NOT NULL
@@ -4788,21 +4755,18 @@
 CREATE TABLE HASHSET_OF_OBJECT2
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
 	COLLVAL LONG VARCHAR FOR BIT DATA
 );
 
 CREATE TABLE HASHSET_OF_SIMPLE_CLASS3
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHSET_OF_SIMPLE_CLASS4
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     ID BIGINT NOT NULL,
     INTVAL INTEGER NOT NULL,
     STRINGVAL VARCHAR(128) NOT NULL
@@ -4811,21 +4775,18 @@
 CREATE TABLE HASHSET_OF_SIMPLE_CLASS5
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
 	COLLVAL LONG VARCHAR FOR BIT DATA
 );
 
 CREATE TABLE HASHSET_OF_SIMPLE_INTERFACE6
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHSET_OF_SIMPLE_INTERFACE7
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     ID BIGINT NOT NULL,
     INTVAL INTEGER NOT NULL,
     STRINGVAL VARCHAR(128) NOT NULL
@@ -4834,161 +4795,138 @@
 CREATE TABLE HASHSET_OF_SIMPLE_INTERFACE8
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
 	COLLVAL LONG VARCHAR FOR BIT DATA
 );
 
 CREATE TABLE HASHSET_OF_STRING9
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     STRINGVAL VARCHAR(1024)
 );
 
 CREATE TABLE HASHSET_OF_STRING10
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     STRINGVAL VARCHAR(1024)
 );
 
 CREATE TABLE HASHSET_OF_DATE12
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     DATEVAL TIMESTAMP
 );
 
 CREATE TABLE HASHSET_OF_DATE13
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     DATEVAL TIMESTAMP
 );
 
 CREATE TABLE HASHSET_OF_LOCALE15
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     LOCALEVAL CHAR(20)
 );
 
 CREATE TABLE HASHSET_OF_LOCALE16
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     LOCALEVAL CHAR(20)
 );
 
 CREATE TABLE HASHSET_OF_BIG_DECIMAL18
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     BIG_DECIMALVAL DECIMAL(27,16)
 );
 
 CREATE TABLE HASHSET_OF_BIG_DECIMAL19
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     BIG_DECIMALVAL DECIMAL(27,16)
 );
 
 CREATE TABLE HASHSET_OF_BIG_INTEGER21
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     BIG_INTEGERVAL BIGINT
 );
 
 CREATE TABLE HASHSET_OF_BIG_INTEGER22
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     BIG_INTEGERVAL BIGINT
 );
 
 CREATE TABLE HASHSET_OF_BYTE24
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     BYTEVAL SMALLINT
 );
 
 CREATE TABLE HASHSET_OF_BYTE25
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     BYTEVAL SMALLINT
 );
 
 CREATE TABLE HASHSET_OF_DOUBLE27
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     DOUBLEVAL DOUBLE
 );
 
 CREATE TABLE HASHSET_OF_DOUBLE28
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     DOUBLEVAL DOUBLE
 );
 
 CREATE TABLE HASHSET_OF_FLOAT30
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     FLOATVAL FLOAT
 );
 
 CREATE TABLE HASHSET_OF_FLOAT31
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     FLOATVAL FLOAT
 );
 
 CREATE TABLE HASHSET_OF_INTEGER33
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     INTEGERVAL INTEGER
 );
 
 CREATE TABLE HASHSET_OF_INTEGER34
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     INTEGERVAL INTEGER
 );
 
 CREATE TABLE HASHSET_OF_LONG36
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     LONGVAL BIGINT
 );
 
 CREATE TABLE HASHSET_OF_LONG37
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     LONGVAL BIGINT
 );
 
 CREATE TABLE HASHSET_OF_SHORT39
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     SHORTVAL SMALLINT
 );
 
 CREATE TABLE HASHSET_OF_SHORT40
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     SHORTVAL SMALLINT
 );
 
Index: test/sql/derby/applicationidentity/schema.sql
===================================================================
--- test/sql/derby/applicationidentity/schema.sql	(revision 345168)
+++ test/sql/derby/applicationidentity/schema.sql	(working copy)
@@ -4536,14 +4536,12 @@
 CREATE TABLE SET_OF_OBJECT0
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE SET_OF_OBJECT1
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     ID BIGINT NOT NULL,
     INTVAL INTEGER NOT NULL,
     STRINGVAL VARCHAR(128) NOT NULL
@@ -4552,21 +4550,18 @@
 CREATE TABLE SET_OF_OBJECT2
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
 	COLLVAL LONG VARCHAR FOR BIT DATA
 );
 
 CREATE TABLE SET_OF_SIMPLE_CLASS3
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE SET_OF_SIMPLE_CLASS4
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     ID BIGINT NOT NULL,
     INTVAL INTEGER NOT NULL,
     STRINGVAL VARCHAR(128) NOT NULL
@@ -4575,21 +4570,18 @@
 CREATE TABLE SET_OF_SIMPLE_CLASS5
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
 	COLLVAL LONG VARCHAR FOR BIT DATA
 );
 
 CREATE TABLE SET_OF_SIMPLE_INTERFACE6
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE SET_OF_SIMPLE_INTERFACE7
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     ID BIGINT NOT NULL,
     INTVAL INTEGER NOT NULL,
     STRINGVAL VARCHAR(128) NOT NULL
@@ -4598,161 +4590,138 @@
 CREATE TABLE SET_OF_SIMPLE_INTERFACE8
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
 	COLLVAL LONG VARCHAR FOR BIT DATA
 );
 
 CREATE TABLE SET_OF_STRING9
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     STRINGVAL VARCHAR(1024)
 );
 
 CREATE TABLE SET_OF_STRING10
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     STRINGVAL VARCHAR(1024)
 );
 
 CREATE TABLE SET_OF_DATE12
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     DATEVAL TIMESTAMP
 );
 
 CREATE TABLE SET_OF_DATE13
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     DATEVAL TIMESTAMP
 );
 
 CREATE TABLE SET_OF_LOCALE15
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     LOCALEVAL CHAR(20)
 );
 
 CREATE TABLE SET_OF_LOCALE16
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     LOCALEVAL CHAR(20)
 );
 
 CREATE TABLE SET_OF_BIG_DECIMAL18
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     BIG_DECIMALVAL DECIMAL(27,16)
 );
 
 CREATE TABLE SET_OF_BIG_DECIMAL19
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     BIG_DECIMALVAL DECIMAL(27,16)
 );
 
 CREATE TABLE SET_OF_BIG_INTEGER21
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     BIG_INTEGERVAL BIGINT
 );
 
 CREATE TABLE SET_OF_BIG_INTEGER22
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     BIG_INTEGERVAL BIGINT
 );
 
 CREATE TABLE SET_OF_BYTE24
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     BYTEVAL SMALLINT
 );
 
 CREATE TABLE SET_OF_BYTE25
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     BYTEVAL SMALLINT
 );
 
 CREATE TABLE SET_OF_DOUBLE27
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     DOUBLEVAL DOUBLE
 );
 
 CREATE TABLE SET_OF_DOUBLE28
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     DOUBLEVAL DOUBLE
 );
 
 CREATE TABLE SET_OF_FLOAT30
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     FLOATVAL FLOAT
 );
 
 CREATE TABLE SET_OF_FLOAT31
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     FLOATVAL FLOAT
 );
 
 CREATE TABLE SET_OF_INTEGER33
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     INTEGERVAL INTEGER
 );
 
 CREATE TABLE SET_OF_INTEGER34
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     INTEGERVAL INTEGER
 );
 
 CREATE TABLE SET_OF_LONG36
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     LONGVAL BIGINT
 );
 
 CREATE TABLE SET_OF_LONG37
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     LONGVAL BIGINT
 );
 
 CREATE TABLE SET_OF_SHORT39
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     SHORTVAL SMALLINT
 );
 
 CREATE TABLE SET_OF_SHORT40
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     SHORTVAL SMALLINT
 );
 
@@ -4779,14 +4748,12 @@
 CREATE TABLE HASHSET_OF_OBJECT0
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHSET_OF_OBJECT1
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     ID BIGINT NOT NULL,
     INTVAL INTEGER NOT NULL,
     STRINGVAL VARCHAR(128) NOT NULL
@@ -4795,21 +4762,18 @@
 CREATE TABLE HASHSET_OF_OBJECT2
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
 	COLLVAL LONG VARCHAR FOR BIT DATA
 );
 
 CREATE TABLE HASHSET_OF_SIMPLE_CLASS3
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHSET_OF_SIMPLE_CLASS4
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     ID BIGINT NOT NULL,
     INTVAL INTEGER NOT NULL,
     STRINGVAL VARCHAR(128) NOT NULL
@@ -4818,21 +4782,18 @@
 CREATE TABLE HASHSET_OF_SIMPLE_CLASS5
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
 	COLLVAL LONG VARCHAR FOR BIT DATA
 );
 
 CREATE TABLE HASHSET_OF_SIMPLE_INTERFACE6
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE HASHSET_OF_SIMPLE_INTERFACE7
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     ID BIGINT NOT NULL,
     INTVAL INTEGER NOT NULL,
     STRINGVAL VARCHAR(128) NOT NULL
@@ -4841,161 +4802,138 @@
 CREATE TABLE HASHSET_OF_SIMPLE_INTERFACE8
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
 	COLLVAL LONG VARCHAR FOR BIT DATA
 );
 
 CREATE TABLE HASHSET_OF_STRING9
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     STRINGVAL VARCHAR(1024)
 );
 
 CREATE TABLE HASHSET_OF_STRING10
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     STRINGVAL VARCHAR(1024)
 );
 
 CREATE TABLE HASHSET_OF_DATE12
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     DATEVAL TIMESTAMP
 );
 
 CREATE TABLE HASHSET_OF_DATE13
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     DATEVAL TIMESTAMP
 );
 
 CREATE TABLE HASHSET_OF_LOCALE15
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     LOCALEVAL CHAR(20)
 );
 
 CREATE TABLE HASHSET_OF_LOCALE16
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     LOCALEVAL CHAR(20)
 );
 
 CREATE TABLE HASHSET_OF_BIG_DECIMAL18
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     BIG_DECIMALVAL DECIMAL(27,16)
 );
 
 CREATE TABLE HASHSET_OF_BIG_DECIMAL19
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     BIG_DECIMALVAL DECIMAL(27,16)
 );
 
 CREATE TABLE HASHSET_OF_BIG_INTEGER21
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     BIG_INTEGERVAL BIGINT
 );
 
 CREATE TABLE HASHSET_OF_BIG_INTEGER22
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     BIG_INTEGERVAL BIGINT
 );
 
 CREATE TABLE HASHSET_OF_BYTE24
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     BYTEVAL SMALLINT
 );
 
 CREATE TABLE HASHSET_OF_BYTE25
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     BYTEVAL SMALLINT
 );
 
 CREATE TABLE HASHSET_OF_DOUBLE27
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     DOUBLEVAL DOUBLE
 );
 
 CREATE TABLE HASHSET_OF_DOUBLE28
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     DOUBLEVAL DOUBLE
 );
 
 CREATE TABLE HASHSET_OF_FLOAT30
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     FLOATVAL FLOAT
 );
 
 CREATE TABLE HASHSET_OF_FLOAT31
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     FLOATVAL FLOAT
 );
 
 CREATE TABLE HASHSET_OF_INTEGER33
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     INTEGERVAL INTEGER
 );
 
 CREATE TABLE HASHSET_OF_INTEGER34
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     INTEGERVAL INTEGER
 );
 
 CREATE TABLE HASHSET_OF_LONG36
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     LONGVAL BIGINT
 );
 
 CREATE TABLE HASHSET_OF_LONG37
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     LONGVAL BIGINT
 );
 
 CREATE TABLE HASHSET_OF_SHORT39
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     SHORTVAL SMALLINT
 );
 
 CREATE TABLE HASHSET_OF_SHORT40
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    ALLOW_DUPLICATES BIGINT NOT NULL,
     SHORTVAL SMALLINT
 );
 
Index: test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-derby.orm
===================================================================
--- test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-derby.orm	(revision 345168)
+++ test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-derby.orm	(working copy)
@@ -9,49 +9,43 @@
                    table="HASHSET_OF_OBJECT0">
                 <join column="IDENTIFIER"/>
                 <element column="OBJREF"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfObject1"
                    table="HASHSET_OF_OBJECT1">
                 <join column="IDENTIFIER"/>
                 <element>
                   <embedded>
-                    <field name="id" column="ID"/>
+                    <field name="id" primary-key="true" column="ID"/>
                     <field name="intField" column="INTVAL"/>
                     <field name="stringField" column="STRINGVAL"/>
                   </embedded>
                 </element>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfObject2"
                    table="HASHSET_OF_OBJECT2">
                 <join column="IDENTIFIER"/>
                 <element column="COLLVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfSimpleClass3"
                    table="HASHSET_OF_SIMPLE_CLASS3">
                 <join column="IDENTIFIER"/>
                 <element column="SIMPCLSREF"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfSimpleClass4"
                    table="HASHSET_OF_SIMPLE_CLASS4">
                 <join column="IDENTIFIER"/>
                 <element>
                   <embedded>
-                    <field name="id" column="ID"/>
+                    <field name="id" primary-key="true" column="ID"/>
                     <field name="intField" column="INTVAL"/>
                     <field name="stringField" column="STRINGVAL"/>
                   </embedded>
                 </element>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfSimpleClass5"
                    table="HASHSET_OF_SIMPLE_CLASS5">
                 <join column="IDENTIFIER"/>
                 <element column="COLLVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfSimpleClass42"
                    column="HASHSET_OF_SIMPLE_CLASS42">
@@ -60,31 +54,27 @@
                    table="HASHSET_OF_SIMPLE_INTERFACE6">
                 <join column="IDENTIFIER"/>
                 <element column="SIMPINTREF"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfSimpleInterface7"
                    table="HASHSET_OF_SIMPLE_INTERFACE7">
                 <join column="IDENTIFIER"/>
                 <element>
                   <embedded>
-                    <field name="id" column="ID"/>
+                    <field name="id" primary-key="true" column="ID"/>
                     <field name="intField" column="INTVAL"/>
                     <field name="stringField" column="STRINGVAL"/>
                   </embedded>
                 </element>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfSimpleInterface8"
                    table="HASHSET_OF_SIMPLE_INTERFACE8">
                 <join column="IDENTIFIER"/>
                 <element column="COLLVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfString9"
                    table="HASHSET_OF_STRING9">
                 <join column="IDENTIFIER"/>
                 <element column="STRINGVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfString11"
                    column="HASHSET_OF_STRING11">
@@ -93,13 +83,11 @@
                    table="HASHSET_OF_STRING10">
                 <join column="IDENTIFIER"/>
                 <element column="STRINGVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfDate12"
                    table="HASHSET_OF_DATE12">
                 <join column="IDENTIFIER"/>
                 <element column="DATEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfDate14"
                    column="HASHSET_OF_DATE14">
@@ -108,13 +96,11 @@
                    table="HASHSET_OF_DATE13">
                 <join column="IDENTIFIER"/>
                 <element column="DATEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfLocale15"
                    table="HASHSET_OF_LOCALE15">
                 <join column="IDENTIFIER"/>
                 <element column="LOCALEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfLocale17"
                    column="HASHSET_OF_LOCALE17">
@@ -123,13 +109,11 @@
                    table="HASHSET_OF_LOCALE16">
                 <join column="IDENTIFIER"/>
                 <element column="LOCALEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfBigDecimal18"
                    table="HASHSET_OF_BIG_DECIMAL18">
                 <join column="IDENTIFIER"/>
                 <element column="BIG_DECIMALVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfBigDecimal20"
                    column="HASHSET_OF_BIG_DECIMAL20">
@@ -138,13 +122,11 @@
                    table="HASHSET_OF_BIG_DECIMAL19">
                 <join column="IDENTIFIER"/>
                 <element column="BIG_DECIMALVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfBigInteger21"
                    table="HASHSET_OF_BIG_INTEGER21">
                 <join column="IDENTIFIER"/>
                 <element column="BIG_INTEGERVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfBigInteger23"
                    column="HASHSET_OF_BIG_INTEGER23">
@@ -153,13 +135,11 @@
                    table="HASHSET_OF_BIG_INTEGER22">
                 <join column="IDENTIFIER"/>
                 <element column="BIG_INTEGERVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfByte24"
                    table="HASHSET_OF_BYTE24">
                 <join column="IDENTIFIER"/>
                 <element column="BYTEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfByte26"
                    column="HASHSET_OF_BYTE26">
@@ -168,13 +148,11 @@
                    table="HASHSET_OF_BYTE25">
                 <join column="IDENTIFIER"/>
                 <element column="BYTEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfDouble27"
                    table="HASHSET_OF_DOUBLE27">
                 <join column="IDENTIFIER"/>
                 <element column="DOUBLEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfDouble29"
                    column="HASHSET_OF_DOUBLE29">
@@ -183,13 +161,11 @@
                    table="HASHSET_OF_DOUBLE28">
                 <join column="IDENTIFIER"/>
                 <element column="DOUBLEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfFloat30"
                    table="HASHSET_OF_FLOAT30">
                 <join column="IDENTIFIER"/>
                 <element column="FLOATVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfFloat32"
                    column="HASHSET_OF_FLOAT32">
@@ -198,13 +174,11 @@
                    table="HASHSET_OF_FLOAT31">
                 <join column="IDENTIFIER"/>
                 <element column="FLOATVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfInteger33"
                    table="HASHSET_OF_INTEGER33">
                 <join column="IDENTIFIER"/>
                 <element column="INTEGERVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfInteger35"
                    column="HASHSET_OF_INTEGER35">
@@ -213,13 +187,11 @@
                    table="HASHSET_OF_INTEGER34">
                 <join column="IDENTIFIER"/>
                 <element column="INTEGERVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfLong36"
                    table="HASHSET_OF_LONG36">
                 <join column="IDENTIFIER"/>
                 <element column="LONGVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfLong38"
                    column="HASHSET_OF_LONG38">
@@ -228,13 +200,11 @@
                    table="HASHSET_OF_LONG37">
                 <join column="IDENTIFIER"/>
                 <element column="LONGVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfShort39"
                    table="HASHSET_OF_SHORT39">
                 <join column="IDENTIFIER"/>
                 <element column="SHORTVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfShort41"
                    column="HASHSET_OF_SHORT41">
@@ -243,7 +213,6 @@
                    table="HASHSET_OF_SHORT40">
                 <join column="IDENTIFIER"/>
                 <element column="SHORTVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
         </class>
     </package>
Index: test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-derby.orm
===================================================================
--- test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-derby.orm	(revision 345168)
+++ test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-derby.orm	(working copy)
@@ -9,49 +9,43 @@
                    table="SET_OF_OBJECT0">
                 <join column="IDENTIFIER"/>
                 <element column="OBJREF"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfObject1"
                    table="SET_OF_OBJECT1">
                 <join column="IDENTIFIER"/>
                 <element>
                   <embedded>
-                    <field name="id" column="ID"/>
+                    <field name="id" primary-key="true" column="ID"/>
                     <field name="intField" column="INTVAL"/>
                     <field name="stringField" column="STRINGVAL"/>
                   </embedded>
                 </element>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfObject2"
                    table="SET_OF_OBJECT2">
                 <join column="IDENTIFIER"/>
                 <element column="COLLVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfSimpleClass3"
                    table="SET_OF_SIMPLE_CLASS3">
                 <join column="IDENTIFIER"/>
                 <element column="SIMPCLSREF"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfSimpleClass4"
                    table="SET_OF_SIMPLE_CLASS4">
                 <join column="IDENTIFIER"/>
                 <element>
                   <embedded>
-                    <field name="id" column="ID"/>
+                    <field name="id" primary-key="true" column="ID"/>
                     <field name="intField" column="INTVAL"/>
                     <field name="stringField" column="STRINGVAL"/>
                   </embedded>
                 </element>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfSimpleClass5"
                    table="SET_OF_SIMPLE_CLASS5">
                 <join column="IDENTIFIER"/>
                 <element column="COLLVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfSimpleClass42"
                    column="SET_OF_SIMPLE_CLASS42">
@@ -60,31 +54,27 @@
                    table="SET_OF_SIMPLE_INTERFACE6">
                 <join column="IDENTIFIER"/>
                 <element column="SIMPINTREF"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfSimpleInterface7"
                    table="SET_OF_SIMPLE_INTERFACE7">
                 <join column="IDENTIFIER"/>
                 <element>
                   <embedded>
-                    <field name="id" column="ID"/>
+                    <field name="id" primary-key="true" column="ID"/>
                     <field name="intField" column="INTVAL"/>
                     <field name="stringField" column="STRINGVAL"/>
                   </embedded>
                 </element>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfSimpleInterface8"
                    table="SET_OF_SIMPLE_INTERFACE8">
                 <join column="IDENTIFIER"/>
                 <element column="COLLVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfString9"
                    table="SET_OF_STRING9">
                 <join column="IDENTIFIER"/>
                 <element column="STRINGVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfString11"
                    column="SET_OF_STRING11">
@@ -93,13 +83,11 @@
                    table="SET_OF_STRING10">
                 <join column="IDENTIFIER"/>
                 <element column="STRINGVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfDate12"
                    table="SET_OF_DATE12">
                 <join column="IDENTIFIER"/>
                 <element column="DATEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfDate14"
                    column="SET_OF_DATE14">
@@ -108,13 +96,11 @@
                    table="SET_OF_DATE13">
                 <join column="IDENTIFIER"/>
                 <element column="DATEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfLocale15"
                    table="SET_OF_LOCALE15">
                 <join column="IDENTIFIER"/>
                 <element column="LOCALEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfLocale17"
                    column="SET_OF_LOCALE17">
@@ -123,13 +109,11 @@
                    table="SET_OF_LOCALE16">
                 <join column="IDENTIFIER"/>
                 <element column="LOCALEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfBigDecimal18"
                    table="SET_OF_BIG_DECIMAL18">
                 <join column="IDENTIFIER"/>
                 <element column="BIG_DECIMALVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfBigDecimal20"
                    column="SET_OF_BIG_DECIMAL20">
@@ -138,13 +122,11 @@
                    table="SET_OF_BIG_DECIMAL19">
                 <join column="IDENTIFIER"/>
                 <element column="BIG_DECIMALVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfBigInteger21"
                    table="SET_OF_BIG_INTEGER21">
                 <join column="IDENTIFIER"/>
                 <element column="BIG_INTEGERVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfBigInteger23"
                    column="SET_OF_BIG_INTEGER23">
@@ -153,13 +135,11 @@
                    table="SET_OF_BIG_INTEGER22">
                 <join column="IDENTIFIER"/>
                 <element column="BIG_INTEGERVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfByte24"
                    table="SET_OF_BYTE24">
                 <join column="IDENTIFIER"/>
                 <element column="BYTEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfByte26"
                    column="SET_OF_BYTE26">
@@ -168,13 +148,11 @@
                    table="SET_OF_BYTE25">
                 <join column="IDENTIFIER"/>
                 <element column="BYTEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfDouble27"
                    table="SET_OF_DOUBLE27">
                 <join column="IDENTIFIER"/>
                 <element column="DOUBLEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfDouble29"
                    column="SET_OF_DOUBLE29">
@@ -183,13 +161,11 @@
                    table="SET_OF_DOUBLE28">
                 <join column="IDENTIFIER"/>
                 <element column="DOUBLEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfFloat30"
                    table="SET_OF_FLOAT30">
                 <join column="IDENTIFIER"/>
                 <element column="FLOATVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfFloat32"
                    column="SET_OF_FLOAT32">
@@ -198,13 +174,11 @@
                    table="SET_OF_FLOAT31">
                 <join column="IDENTIFIER"/>
                 <element column="FLOATVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfInteger33"
                    table="SET_OF_INTEGER33">
                 <join column="IDENTIFIER"/>
                 <element column="INTEGERVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfInteger35"
                    column="SET_OF_INTEGER35">
@@ -213,13 +187,11 @@
                    table="SET_OF_INTEGER34">
                 <join column="IDENTIFIER"/>
                 <element column="INTEGERVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfLong36"
                    table="SET_OF_LONG36">
                 <join column="IDENTIFIER"/>
                 <element column="LONGVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfLong38"
                    column="SET_OF_LONG38">
@@ -228,13 +200,11 @@
                    table="SET_OF_LONG37">
                 <join column="IDENTIFIER"/>
                 <element column="LONGVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfShort39"
                    table="SET_OF_SHORT39">
                 <join column="IDENTIFIER"/>
                 <element column="SHORTVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfShort41"
                    column="SET_OF_SHORT41">
@@ -243,7 +213,6 @@
                    table="SET_OF_SHORT40">
                 <join column="IDENTIFIER"/>
                 <element column="SHORTVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
         </class>
     </package>
Index: test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-derby.orm
===================================================================
--- test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-derby.orm	(revision 345168)
+++ test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-derby.orm	(working copy)
@@ -8,7 +8,6 @@
                    table="HASHSET_OF_OBJECT0">
                 <join column="IDENTIFIER"/>
                 <element column="OBJREF"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfObject1"
                    table="HASHSET_OF_OBJECT1">
@@ -20,19 +19,16 @@
                     <field name="stringField" column="STRINGVAL"/>
                   </embedded>
                 </element>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfObject2"
                    table="HASHSET_OF_OBJECT2">
                 <join column="IDENTIFIER"/>
                 <element column="COLLVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfSimpleClass3"
                    table="HASHSET_OF_SIMPLE_CLASS3">
                 <join column="IDENTIFIER"/>
                 <element column="SIMPCLSREF"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfSimpleClass4"
                    table="HASHSET_OF_SIMPLE_CLASS4">
@@ -44,13 +40,11 @@
                     <field name="stringField" column="STRINGVAL"/>
                   </embedded>
                 </element>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfSimpleClass5"
                    table="HASHSET_OF_SIMPLE_CLASS5">
                 <join column="IDENTIFIER"/>
                 <element column="COLLVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfSimpleClass42"
                    column="HASHSET_OF_SIMPLE_CLASS42">
@@ -59,7 +53,6 @@
                    table="HASHSET_OF_SIMPLE_INTERFACE6">
                 <join column="IDENTIFIER"/>
                 <element column="SIMPINTREF"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfSimpleInterface7"
                    table="HASHSET_OF_SIMPLE_INTERFACE7">
@@ -71,19 +64,16 @@
                     <field name="stringField" column="STRINGVAL"/>
                   </embedded>
                 </element>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfSimpleInterface8"
                    table="HASHSET_OF_SIMPLE_INTERFACE8">
                 <join column="IDENTIFIER"/>
                 <element column="COLLVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfString9"
                    table="HASHSET_OF_STRING9">
                 <join column="IDENTIFIER"/>
                 <element column="STRINGVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfString11"
                    column="HASHSET_OF_STRING11">
@@ -92,13 +82,11 @@
                    table="HASHSET_OF_STRING10">
                 <join column="IDENTIFIER"/>
                 <element column="STRINGVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfDate12"
                    table="HASHSET_OF_DATE12">
                 <join column="IDENTIFIER"/>
                 <element column="DATEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfDate14"
                    column="HASHSET_OF_DATE14">
@@ -107,13 +95,11 @@
                    table="HASHSET_OF_DATE13">
                 <join column="IDENTIFIER"/>
                 <element column="DATEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfLocale15"
                    table="HASHSET_OF_LOCALE15">
                 <join column="IDENTIFIER"/>
                 <element column="LOCALEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfLocale17"
                    column="HASHSET_OF_LOCALE17">
@@ -122,13 +108,11 @@
                    table="HASHSET_OF_LOCALE16">
                 <join column="IDENTIFIER"/>
                 <element column="LOCALEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfBigDecimal18"
                    table="HASHSET_OF_BIG_DECIMAL18">
                 <join column="IDENTIFIER"/>
                 <element column="BIG_DECIMALVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfBigDecimal20"
                    column="HASHSET_OF_BIG_DECIMAL20">
@@ -137,13 +121,11 @@
                    table="HASHSET_OF_BIG_DECIMAL19">
                 <join column="IDENTIFIER"/>
                 <element column="BIG_DECIMALVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfBigInteger21"
                    table="HASHSET_OF_BIG_INTEGER21">
                 <join column="IDENTIFIER"/>
                 <element column="BIG_INTEGERVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfBigInteger23"
                    column="HASHSET_OF_BIG_INTEGER23">
@@ -152,13 +134,11 @@
                    table="HASHSET_OF_BIG_INTEGER22">
                 <join column="IDENTIFIER"/>
                 <element column="BIG_INTEGERVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfByte24"
                    table="HASHSET_OF_BYTE24">
                 <join column="IDENTIFIER"/>
                 <element column="BYTEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfByte26"
                    column="HASHSET_OF_BYTE26">
@@ -167,13 +147,11 @@
                    table="HASHSET_OF_BYTE25">
                 <join column="IDENTIFIER"/>
                 <element column="BYTEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfDouble27"
                    table="HASHSET_OF_DOUBLE27">
                 <join column="IDENTIFIER"/>
                 <element column="DOUBLEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfDouble29"
                    column="HASHSET_OF_DOUBLE29">
@@ -182,13 +160,11 @@
                    table="HASHSET_OF_DOUBLE28">
                 <join column="IDENTIFIER"/>
                 <element column="DOUBLEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfFloat30"
                    table="HASHSET_OF_FLOAT30">
                 <join column="IDENTIFIER"/>
                 <element column="FLOATVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfFloat32"
                    column="HASHSET_OF_FLOAT32">
@@ -197,13 +173,11 @@
                    table="HASHSET_OF_FLOAT31">
                 <join column="IDENTIFIER"/>
                 <element column="FLOATVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfInteger33"
                    table="HASHSET_OF_INTEGER33">
                 <join column="IDENTIFIER"/>
                 <element column="INTEGERVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfInteger35"
                    column="HASHSET_OF_INTEGER35">
@@ -212,13 +186,11 @@
                    table="HASHSET_OF_INTEGER34">
                 <join column="IDENTIFIER"/>
                 <element column="INTEGERVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfLong36"
                    table="HASHSET_OF_LONG36">
                 <join column="IDENTIFIER"/>
                 <element column="LONGVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfLong38"
                    column="HASHSET_OF_LONG38">
@@ -227,13 +199,11 @@
                    table="HASHSET_OF_LONG37">
                 <join column="IDENTIFIER"/>
                 <element column="LONGVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfShort39"
                    table="HASHSET_OF_SHORT39">
                 <join column="IDENTIFIER"/>
                 <element column="SHORTVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="HashSetOfShort41"
                    column="HASHSET_OF_SHORT41">
@@ -242,7 +212,6 @@
                    table="HASHSET_OF_SHORT40">
                 <join column="IDENTIFIER"/>
                 <element column="SHORTVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
         </class>
     </package>
Index: test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-derby.orm
===================================================================
--- test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-derby.orm	(revision 345168)
+++ test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-derby.orm	(working copy)
@@ -8,7 +8,6 @@
                    table="SET_OF_OBJECT0">
                 <join column="IDENTIFIER"/>
                 <element column="OBJREF"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfObject1"
                    table="SET_OF_OBJECT1">
@@ -20,19 +19,16 @@
                     <field name="stringField" column="STRINGVAL"/>
                   </embedded>
                 </element>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfObject2"
                    table="SET_OF_OBJECT2">
                 <join column="IDENTIFIER"/>
                 <element column="COLLVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfSimpleClass3"
                    table="SET_OF_SIMPLE_CLASS3">
                 <join column="IDENTIFIER"/>
                 <element column="SIMPCLSREF"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfSimpleClass4"
                    table="SET_OF_SIMPLE_CLASS4">
@@ -44,13 +40,11 @@
                     <field name="stringField" column="STRINGVAL"/>
                   </embedded>
                 </element>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfSimpleClass5"
                    table="SET_OF_SIMPLE_CLASS5">
                 <join column="IDENTIFIER"/>
                 <element column="COLLVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfSimpleClass42"
                    column="SET_OF_SIMPLE_CLASS42">
@@ -59,7 +53,6 @@
                    table="SET_OF_SIMPLE_INTERFACE6">
                 <join column="IDENTIFIER"/>
                 <element column="SIMPINTREF"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfSimpleInterface7"
                    table="SET_OF_SIMPLE_INTERFACE7">
@@ -71,19 +64,16 @@
                     <field name="stringField" column="STRINGVAL"/>
                   </embedded>
                 </element>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfSimpleInterface8"
                    table="SET_OF_SIMPLE_INTERFACE8">
                 <join column="IDENTIFIER"/>
                 <element column="COLLVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfString9"
                    table="SET_OF_STRING9">
                 <join column="IDENTIFIER"/>
                 <element column="STRINGVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfString11"
                    column="SET_OF_STRING11">
@@ -92,13 +82,11 @@
                    table="SET_OF_STRING10">
                 <join column="IDENTIFIER"/>
                 <element column="STRINGVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfDate12"
                    table="SET_OF_DATE12">
                 <join column="IDENTIFIER"/>
                 <element column="DATEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfDate14"
                    column="SET_OF_DATE14">
@@ -107,13 +95,11 @@
                    table="SET_OF_DATE13">
                 <join column="IDENTIFIER"/>
                 <element column="DATEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfLocale15"
                    table="SET_OF_LOCALE15">
                 <join column="IDENTIFIER"/>
                 <element column="LOCALEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfLocale17"
                    column="SET_OF_LOCALE17">
@@ -122,13 +108,11 @@
                    table="SET_OF_LOCALE16">
                 <join column="IDENTIFIER"/>
                 <element column="LOCALEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfBigDecimal18"
                    table="SET_OF_BIG_DECIMAL18">
                 <join column="IDENTIFIER"/>
                 <element column="BIG_DECIMALVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfBigDecimal20"
                    column="SET_OF_BIG_DECIMAL20">
@@ -137,13 +121,11 @@
                    table="SET_OF_BIG_DECIMAL19">
                 <join column="IDENTIFIER"/>
                 <element column="BIG_DECIMALVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfBigInteger21"
                    table="SET_OF_BIG_INTEGER21">
                 <join column="IDENTIFIER"/>
                 <element column="BIG_INTEGERVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfBigInteger23"
                    column="SET_OF_BIG_INTEGER23">
@@ -152,13 +134,11 @@
                    table="SET_OF_BIG_INTEGER22">
                 <join column="IDENTIFIER"/>
                 <element column="BIG_INTEGERVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfByte24"
                    table="SET_OF_BYTE24">
                 <join column="IDENTIFIER"/>
                 <element column="BYTEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfByte26"
                    column="SET_OF_BYTE26">
@@ -167,13 +147,11 @@
                    table="SET_OF_BYTE25">
                 <join column="IDENTIFIER"/>
                 <element column="BYTEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfDouble27"
                    table="SET_OF_DOUBLE27">
                 <join column="IDENTIFIER"/>
                 <element column="DOUBLEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfDouble29"
                    column="SET_OF_DOUBLE29">
@@ -182,13 +160,11 @@
                    table="SET_OF_DOUBLE28">
                 <join column="IDENTIFIER"/>
                 <element column="DOUBLEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfFloat30"
                    table="SET_OF_FLOAT30">
                 <join column="IDENTIFIER"/>
                 <element column="FLOATVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfFloat32"
                    column="SET_OF_FLOAT32">
@@ -197,13 +173,11 @@
                    table="SET_OF_FLOAT31">
                 <join column="IDENTIFIER"/>
                 <element column="FLOATVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfInteger33"
                    table="SET_OF_INTEGER33">
                 <join column="IDENTIFIER"/>
                 <element column="INTEGERVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfInteger35"
                    column="SET_OF_INTEGER35">
@@ -212,13 +186,11 @@
                    table="SET_OF_INTEGER34">
                 <join column="IDENTIFIER"/>
                 <element column="INTEGERVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfLong36"
                    table="SET_OF_LONG36">
                 <join column="IDENTIFIER"/>
                 <element column="LONGVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfLong38"
                    column="SET_OF_LONG38">
@@ -227,13 +199,11 @@
                    table="SET_OF_LONG37">
                 <join column="IDENTIFIER"/>
                 <element column="LONGVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfShort39"
                    table="SET_OF_SHORT39">
                 <join column="IDENTIFIER"/>
                 <element column="SHORTVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="SetOfShort41"
                    column="SET_OF_SHORT41">
@@ -242,7 +212,6 @@
                    table="SET_OF_SHORT40">
                 <join column="IDENTIFIER"/>
                 <element column="SHORTVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
             </field>
         </class>
     </package>