Attachment #141821 for bug #283759

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Lines 2066-2072 Link Here

(-)foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/databaseaccess/DatabasePlatform.java (-1 / +1 lines)
2066	* If the platform supportsSequenceObjects then (at least) one of buildSelectQueryForSequenceObject	2066	* If the platform supportsSequenceObjects then (at least) one of buildSelectQueryForSequenceObject
2067	* methods should return non-null query.	2067	* methods should return non-null query.
2068	*/	2068	*/
2069	public ValueReadQuery buildSelectQueryForSequenceObject(String seqName, Integer size) {	2069	public ValueReadQuery buildSelectQueryForSequenceObject(String qualifiedSeqName, Integer size) {
2070	return null;	2070	return null;
2071	}	2071	}
2072		2072

Lines 279-286 Link Here

(-)foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/platform/database/InformixPlatform.java (-2 / +2 lines)
279	* If the platform supportsSequenceObjects then (at least) one of buildSelectQueryForSequenceObject	279	* If the platform supportsSequenceObjects then (at least) one of buildSelectQueryForSequenceObject
280	* methods should return non-null query.	280	* methods should return non-null query.
281	*/	281	*/
282	public ValueReadQuery buildSelectQueryForSequenceObject(String seqName, Integer size) {	282	public ValueReadQuery buildSelectQueryForSequenceObject(String qualifiedSeqName, Integer size) {
283	return new ValueReadQuery("select " + getQualifiedName(seqName) + ".nextval from systables where tabid = 1");	283	return new ValueReadQuery("select " + qualifiedSeqName + ".nextval from systables where tabid = 1");
284	}	284	}
285		285
286	/**	286	/**




     * INTERNAL:
     * Produce a DataReadQuery which updates(!) the sequence number in the db
     * and returns it. Currently implemented on Oracle only.
     * @param qualifiedSeqName known by Oracle to be a defined sequence
     */
    public ValueReadQuery buildSelectQueryForSequenceObject(String qualifiedSeqName, Integer size) {
        return new ValueReadQuery("SELECT " + qualifiedSeqName + ".NEXTVAL FROM DUAL");
    }

    /**
     * INTERNAL:
     * Though Oracle doesn't support identity it could be imitated,
     * see comment to setSupportsIdentity method.
     * @param qualifiedSeqName known by Oracle to be a defined sequence
     */
    public ValueReadQuery buildSelectQueryForIdentity(String qualifiedSeqName, Integer size) {
        return new ValueReadQuery("SELECT " + qualifiedSeqName + ".CURRVAL FROM DUAL");
    }

    /**

Lines 237-244 Link Here

(-)foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/platform/database/PostgreSQLPlatform.java (-2 / +2 lines)
237	* If the platform supportsSequenceObjects then (at least) one of buildSelectQueryForSequenceObject	237	* If the platform supportsSequenceObjects then (at least) one of buildSelectQueryForSequenceObject
238	* methods should return non-null query.	238	* methods should return non-null query.
239	*/	239	*/
240	public ValueReadQuery buildSelectQueryForSequenceObject(String seqName, Integer size) {	240	public ValueReadQuery buildSelectQueryForSequenceObject(String qualifiedSeqName, Integer size) {
241	return new ValueReadQuery("select nextval(\'" + getQualifiedName(seqName) + "\')");	241	return new ValueReadQuery("select nextval(\'" + qualifiedSeqName + "\')");
242	}	242	}
243		243
244	/**	244	/**





    /**
     * INTERNAL:
     *  Produce a DataReadQuery which updates(!) the sequence number in the db
     *  and returns it. 
     *  @param qualifiedSeqName known by TimesTen to be a defined sequence
     */
    public ValueReadQuery buildSelectQueryForSequenceObject(String qualifiedSeqName, Integer size) {
        return new ValueReadQuery("SELECT " + qualifiedSeqName + ".NEXTVAL FROM DUAL");
    }

    /**

    }
    
    /**
     *  Prepend sequence name with table qualifier (if any)
     */
    protected String getQualifiedSequenceName(String seqName) {
        if (getTableQualifier().equals("")) {
            return seqName;
        } else {
            return getTableQualifier() + "." + seqName;
        }
    }

    /**
     * INTERNAL:
     * Used for pessimistic locking.
     */

Lines 149-155 Link Here

(-)foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/sequencing/DefaultSequence.java (-2 / +9 lines)
149	* It's a chance to do initialization.	149	* It's a chance to do initialization.
150	*/	150	*/
151	protected void onConnect() {	151	protected void onConnect() {
152	// nothing to do	152	qualifier = getDefaultSequence().getQualifier();
153	}	153	}
154		154
155	/**	155	/**
Lines 158-163 Link Here
158	* It's a chance to do deinitialization.	158	* It's a chance to do deinitialization.
159	*/	159	*/
160	public void onDisconnect() {	160	public void onDisconnect() {
161	// nothing to do	161	qualifier = "";
162	}	162	}
		163
		164	/**
		165	* INTERNAL:
		166	* Ignored, getDefaultSequence().getQualifier() used instead.
		167	*/
		168	public void setQualifier(String qualifier) {
		169	}
163	}	170	}

Lines 121-129 Link Here

(-)foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/sequencing/NativeSequence.java (-2 / +2 lines)
121	*/	121	*/
122	protected ValueReadQuery buildSelectQuery(String seqName, Integer size) {	122	protected ValueReadQuery buildSelectQuery(String seqName, Integer size) {
123	if(this.shouldAcquireValueAfterInsert()) {	123	if(this.shouldAcquireValueAfterInsert()) {
124	return ((DatabasePlatform)getDatasourcePlatform()).buildSelectQueryForIdentity(seqName, size);	124	return ((DatabasePlatform)getDatasourcePlatform()).buildSelectQueryForIdentity(getQualified(seqName), size);
125	} else {	125	} else {
126	return ((DatabasePlatform)getDatasourcePlatform()).buildSelectQueryForSequenceObject(seqName, size);	126	return ((DatabasePlatform)getDatasourcePlatform()).buildSelectQueryForSequenceObject(getQualified(seqName), size);
127	}	127	}
128	}	128	}
129		129

Lines 48-53 Link Here

(-)foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/sequencing/Sequence.java (+47 lines)
48	// number of times onConnect was called - number of times onDisconnect was called	48	// number of times onConnect was called - number of times onDisconnect was called
49	protected int depth;	49	protected int depth;
50		50
		51	protected String qualifier = "";
		52	// true indicates that qualifier was set through setQualifier method,
		53	// false - copied from platform (or not set at all).
		54	protected boolean isCustomQualifier;
		55
51	public Sequence() {	56	public Sequence() {
52	super();	57	super();
53	}	58	}
Lines 253-258 Link Here
253	*/	258	*/
254	public void onConnect(Platform platform) {	259	public void onConnect(Platform platform) {
255	setDatasourcePlatform(platform);	260	setDatasourcePlatform(platform);
		261	if(depth==0 && !isCustomQualifier) {
		262	qualifier = getDatasourcePlatform().getTableQualifier();
		263	}
256	onConnect();	264	onConnect();
257	depth++;	265	depth++;
258	}	266	}
Lines 272-277 Link Here
272	public void onDisconnect(Platform platform) {	280	public void onDisconnect(Platform platform) {
273	if (isConnected()) {	281	if (isConnected()) {
274	depth--;	282	depth--;
		283	if(depth==0 && !isCustomQualifier) {
		284	qualifier = "";
		285	}
275	// Can no longer disconnect sequences, as they are part of descriptor shared meta-data.	286	// Can no longer disconnect sequences, as they are part of descriptor shared meta-data.
276	}	287	}
277	}	288	}
Lines 306-309 Link Here
306	throw ValidationException.sequenceCannotBeConnectedToTwoPlatforms(getName(), name1, name2);	317	throw ValidationException.sequenceCannotBeConnectedToTwoPlatforms(getName(), name1, name2);
307	}	318	}
308	}	319	}
		320
		321	/**
		322	* INTERNAL:
		323	*/
		324	public void setQualifier(String qualifier) {
		325	if(qualifier == null) {
		326	qualifier = "";
		327	}
		328	this.isCustomQualifier = qualifier.length() > 0;
		329	this.qualifier = qualifier;
		330	}
		331
		332	/**
		333	* INTERNAL:
		334	*/
		335	public boolean isCustomQualifier() {
		336	return isCustomQualifier;
		337	}
		338
		339	/**
		340	* INTERNAL:
		341	*/
		342	public String getQualifier() {
		343	return qualifier;
		344	}
		345
		346	/**
		347	* INTERNAL:
		348	*/
		349	public String getQualified(String str) {
		350	if (qualifier.equals("")) {
		351	return str;
		352	} else {
		353	return qualifier + "." + str;
		354	}
		355	}
309	}	356	}




    /** Hold the name of the column in the sequence table which specifies the sequence name */
    protected String nameFieldName = "SEQ_NAME";
    
    /** Hold the name of the table qualifier */
    protected String qualifier = "";

    public TableSequence() {
        super(false, true);
        setTableName(defaultTableName);

    }

    public String getQualifiedTableName() {
        return getQualified(getTableName());
            return getTableName();
        } else {
            return qualifier + "." + getTableName();
        }
    }

    public void setTable(DatabaseTable table) {


        return query;
    }

    /**
    * INTERNAL:
    */
    public void onConnect() {
        qualifier = getDatasourcePlatform().getTableQualifier();
        super.onConnect();
    }

    /**
    * INTERNAL:
    */
    public void onDisconnect() {
        super.onDisconnect();
        qualifier = "";
    }
}




    protected String selectString2;
    protected int updateStringBufferSize;
    protected int selectStringBufferSize;
    protected String qualifier = "";

    public UnaryTableSequence() {
        super(false, true);

    * INTERNAL:
    */
    public void onConnect() {
        qualifier = getDatasourcePlatform().getTableQualifier();
        super.onConnect();
        initialize();
    }

    public void onDisconnect() {
        clear();
        super.onDisconnect();
        qualifier = "";
    }

    protected ValueReadQuery buildSelectQuery(String seqName, Integer size) {

Lines 148-151 Link Here

(-)foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/tools/schemaframework/SequenceObjectDefinition.java (+9 lines)
148	this.buildAlterIncrementWriter(session, schemaWriter);	148	this.buildAlterIncrementWriter(session, schemaWriter);
149	}	149	}
150	}	150	}
		151
		152	/**
		153	* INTERNAL:
		154	* Most major databases support a creator name scope.
		155	* This means whenever the database object is referenced, it must be qualified.
		156	*/
		157	public String getFullName() {
		158	return sequence.getQualified(getName());
		159	}
151	}	160	}

Lines 1130-1136 Link Here

(-)jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/internal/jpa/metadata/accessors/classes/EntityAccessor.java (-1 / +1 lines)
1130	protected void processSequenceGenerator() {	1130	protected void processSequenceGenerator() {
1131	// Process the xml defined sequence generator first.	1131	// Process the xml defined sequence generator first.
1132	if (m_sequenceGenerator != null) {	1132	if (m_sequenceGenerator != null) {
1133	getProject().addSequenceGenerator(m_sequenceGenerator);	1133	getProject().addSequenceGenerator(m_sequenceGenerator, getDescriptor().getDefaultCatalog(), getDescriptor().getDefaultSchema());
1134	}	1134	}
1135		1135
1136	// Process the annotation defined sequence generator second.	1136	// Process the annotation defined sequence generator second.

Lines 1038-1044 Link Here

(-)jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/internal/jpa/metadata/accessors/classes/MappedSuperclassAccessor.java (-1 / +1 lines)
1038	protected void processSequenceGenerator() {	1038	protected void processSequenceGenerator() {
1039	if (isAnnotationPresent(SequenceGenerator.class)) {	1039	if (isAnnotationPresent(SequenceGenerator.class)) {
1040	// Ask the common processor to process what we found.	1040	// Ask the common processor to process what we found.
1041	getProject().addSequenceGenerator(new SequenceGeneratorMetadata(getAnnotation(SequenceGenerator.class), getAccessibleObject()));	1041	getProject().addSequenceGenerator(new SequenceGeneratorMetadata(getAnnotation(SequenceGenerator.class), getAccessibleObject()), getDescriptor().getDefaultCatalog(), getDescriptor().getDefaultSchema());
1042	}	1042	}
1043	}	1043	}
1044		1044

Lines 321-327 Link Here

(-)jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/internal/jpa/metadata/accessors/mappings/BasicAccessor.java (-1 / +1 lines)
321		321
322	// Add the sequence generator to the project if one is set.	322	// Add the sequence generator to the project if one is set.
323	if (m_sequenceGenerator != null) {	323	if (m_sequenceGenerator != null) {
324	getProject().addSequenceGenerator(m_sequenceGenerator);	324	getProject().addSequenceGenerator(m_sequenceGenerator, getDescriptor().getDefaultCatalog(), getDescriptor().getDefaultSchema());
325	}	325	}
326	}	326	}
327		327

Lines 499-505 Link Here

(-)jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/internal/jpa/metadata/MetadataProject.java (-1 / +8 lines)
499	* Add a sequence generator metadata to the project. The actual processing	499	* Add a sequence generator metadata to the project. The actual processing
500	* isn't done till processSequencing is called.	500	* isn't done till processSequencing is called.
501	*/	501	*/
502	public void addSequenceGenerator(SequenceGeneratorMetadata sequenceGenerator) {	502	public void addSequenceGenerator(SequenceGeneratorMetadata sequenceGenerator, String defaultCatalog, String defaultSchema) {
503	String name = sequenceGenerator.getName();	503	String name = sequenceGenerator.getName();
504		504
505	// Check if the sequence generator name uses a reserved name.	505	// Check if the sequence generator name uses a reserved name.
Lines 509-514 Link Here
509	throw ValidationException.sequenceGeneratorUsingAReservedName(DEFAULT_IDENTITY_GENERATOR, sequenceGenerator.getLocation());	509	throw ValidationException.sequenceGeneratorUsingAReservedName(DEFAULT_IDENTITY_GENERATOR, sequenceGenerator.getLocation());
510	}	510	}
511		511
		512	// Catalog could be "" or null, need to check for an XML default.
		513	sequenceGenerator.setCatalog(MetadataHelper.getName(sequenceGenerator.getCatalog(), defaultCatalog, sequenceGenerator.getCatalogContext(), m_logger, sequenceGenerator.getLocation()));
		514	// Schema could be "" or null, need to check for an XML default.
		515	sequenceGenerator.setSchema(MetadataHelper.getName(sequenceGenerator.getSchema(), defaultSchema, sequenceGenerator.getSchemaContext(), m_logger, sequenceGenerator.getLocation()));
		516
		517
512	// Check if the name is used with a table generator.	518	// Check if the name is used with a table generator.
513	TableGeneratorMetadata tableGenerator = m_tableGenerators.get(name);	519	TableGeneratorMetadata tableGenerator = m_tableGenerators.get(name);
514	if (tableGenerator != null) {	520	if (tableGenerator != null) {
Lines 1006-1011 Link Here
1006	}	1012	}
1007		1013
1008	NativeSequence sequence = new NativeSequence(seqName, allocationSize, false);	1014	NativeSequence sequence = new NativeSequence(seqName, allocationSize, false);
		1015	sequence.setQualifier(sequenceGenerator.getQualifier());
1009	sequences.put(sequenceGeneratorName, sequence);	1016	sequences.put(sequenceGeneratorName, sequence);
1010		1017
1011	if (sequenceGeneratorName.equals(DEFAULT_AUTO_GENERATOR)) {	1018	if (sequenceGeneratorName.equals(DEFAULT_AUTO_GENERATOR)) {

Lines 14-19 Link Here

(-)jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/internal/jpa/metadata/sequencing/SequenceGeneratorMetadata.java (+67 lines)
14	******************************************************************************/	14	******************************************************************************/
15	package org.eclipse.persistence.internal.jpa.metadata.sequencing;	15	package org.eclipse.persistence.internal.jpa.metadata.sequencing;
16		16
		17	import org.eclipse.persistence.internal.jpa.metadata.MetadataLogger;
17	import org.eclipse.persistence.internal.jpa.metadata.ORMetadata;	18	import org.eclipse.persistence.internal.jpa.metadata.ORMetadata;
18	import org.eclipse.persistence.internal.jpa.metadata.accessors.objects.MetadataAccessibleObject;	19	import org.eclipse.persistence.internal.jpa.metadata.accessors.objects.MetadataAccessibleObject;
19	import org.eclipse.persistence.internal.jpa.metadata.accessors.objects.MetadataAnnotation;	20	import org.eclipse.persistence.internal.jpa.metadata.accessors.objects.MetadataAnnotation;
Lines 30-35 Link Here
30	private Integer m_initialValue;	31	private Integer m_initialValue;
31		32
32	private String m_name;	33	private String m_name;
		34	private String m_schema;
		35	private String m_catalog;
33	private String m_sequenceName;	36	private String m_sequenceName;
34		37
35	/**	38	/**
Lines 48-53 Link Here
48	m_allocationSize = (Integer) sequenceGenerator.getAttribute("allocationSize");	51	m_allocationSize = (Integer) sequenceGenerator.getAttribute("allocationSize");
49	m_initialValue = (Integer) sequenceGenerator.getAttribute("initialValue");	52	m_initialValue = (Integer) sequenceGenerator.getAttribute("initialValue");
50	m_name = (String) sequenceGenerator.getAttributeString("name");	53	m_name = (String) sequenceGenerator.getAttributeString("name");
		54	m_schema = (String) sequenceGenerator.getAttribute("schema");
		55	m_catalog = (String) sequenceGenerator.getAttribute("catalog");
51	m_sequenceName = (String) sequenceGenerator.getAttributeString("sequenceName");	56	m_sequenceName = (String) sequenceGenerator.getAttributeString("sequenceName");
52	}	57	}
53		58
Lines 87-92 Link Here
87		92
88	/**	93	/**
89	* INTERNAL:	94	* INTERNAL:
		95	* Used for OX mapping.
		96	*/
		97	public String getCatalog() {
		98	return m_catalog;
		99	}
		100
		101	/**
		102	* INTERNAL:
		103	* Used for processing.
		104	*/
		105	public String getQualifier() {
		106	if(m_catalog.length() == 0) {
		107	if(m_schema.length() == 0) {
		108	return "";
		109	} else {
		110	return m_schema;
		111	}
		112	} else {
		113	return m_catalog + '.' + m_schema;
		114	}
		115	}
		116
		117	/**
		118	* INTERNAL:
		119	*/
		120	public String getCatalogContext() {
		121	return MetadataLogger.TABLE_CATALOG;
		122	}
		123
		124	/**
		125	* INTERNAL:
90	* To satisfy the abstract getIdentifier() method from ORMetadata.	126	* To satisfy the abstract getIdentifier() method from ORMetadata.
91	*/	127	*/
92	@Override	128	@Override
Lines 114-119 Link Here
114	* INTERNAL:	150	* INTERNAL:
115	* Used for OX mapping.	151	* Used for OX mapping.
116	*/	152	*/
		153	public String getSchema() {
		154	return m_schema;
		155	}
		156
		157	/**
		158	* INTERNAL:
		159	*/
		160	public String getSchemaContext() {
		161	return MetadataLogger.TABLE_SCHEMA;
		162	}
		163
		164	/**
		165	* INTERNAL:
		166	* Used for OX mapping.
		167	*/
117	public String getSequenceName() {	168	public String getSequenceName() {
118	return m_sequenceName;	169	return m_sequenceName;
119	}	170	}
Lines 130-135 Link Here
130	* INTERNAL:	181	* INTERNAL:
131	* Used for OX mapping.	182	* Used for OX mapping.
132	*/	183	*/
		184	public void setCatalog(String catalog) {
		185	m_catalog = catalog;
		186	}
		187
		188	/**
		189	* INTERNAL:
		190	* Used for OX mapping.
		191	*/
133	public void setInitialValue(Integer initialValue) {	192	public void setInitialValue(Integer initialValue) {
134	m_initialValue = initialValue;	193	m_initialValue = initialValue;
135	}	194	}
Lines 146-151 Link Here
146	* INTERNAL:	205	* INTERNAL:
147	* Used for OX mapping.	206	* Used for OX mapping.
148	*/	207	*/
		208	public void setSchema(String schema) {
		209	m_schema = schema;
		210	}
		211
		212	/**
		213	* INTERNAL:
		214	* Used for OX mapping.
		215	*/
149	public void setSequenceName(String sequenceName) {	216	public void setSequenceName(String sequenceName) {
150	m_sequenceName = sequenceName;	217	m_sequenceName = sequenceName;
151	}	218	}

Lines 591-597 Link Here

(-)jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/internal/jpa/metadata/xml/XMLEntityMappings.java (-1 / +1 lines)
591	// Add the XML sequence generators to the project.	591	// Add the XML sequence generators to the project.
592	for (SequenceGeneratorMetadata sequenceGenerator : m_sequenceGenerators) {	592	for (SequenceGeneratorMetadata sequenceGenerator : m_sequenceGenerators) {
593	sequenceGenerator.initXMLObject(m_file, this);	593	sequenceGenerator.initXMLObject(m_file, this);
594	m_project.addSequenceGenerator(sequenceGenerator);	594	m_project.addSequenceGenerator(sequenceGenerator, getDefaultCatalog(), getDefaultSchema());
595	}	595	}
596		596
597	// Add the XML named queries to the project.	597	// Add the XML named queries to the project.

Lines 1952-1957 Link Here

(-)jpa/org.eclipse.persistence.jpa/src/org/eclipse/persistence/internal/jpa/metadata/xml/XMLEntityMappingsMappingProject.java (+2 lines)
1952	sequenceNameMapping.setXPath("@sequence-name");	1952	sequenceNameMapping.setXPath("@sequence-name");
1953	descriptor.addMapping(sequenceNameMapping);	1953	descriptor.addMapping(sequenceNameMapping);
1954		1954
		1955	descriptor.addMapping(getCatalogAttributeMapping());
		1956	descriptor.addMapping(getSchemaAttributeMapping());
1955	descriptor.addMapping(getInitialValueAttributeMapping());	1957	descriptor.addMapping(getInitialValueAttributeMapping());
1956	descriptor.addMapping(getAllocationSizeAttributeMapping());	1958	descriptor.addMapping(getAllocationSizeAttributeMapping());
1957		1959

Return to bug 283759

Lines 478-497 Link Here

(-)foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/platform/database/OraclePlatform.java (-7 / +7 lines)
478	* INTERNAL:	478	* INTERNAL:
479	* Produce a DataReadQuery which updates(!) the sequence number in the db	479	* Produce a DataReadQuery which updates(!) the sequence number in the db
480	* and returns it. Currently implemented on Oracle only.	480	* and returns it. Currently implemented on Oracle only.
481	* @param sequenceName Name known by Oracle to be a defined sequence	481	* @param qualifiedSeqName known by Oracle to be a defined sequence
482	*/	482	*/
483	public ValueReadQuery buildSelectQueryForSequenceObject(String seqName, Integer size) {	483	public ValueReadQuery buildSelectQueryForSequenceObject(String qualifiedSeqName, Integer size) {
484	return new ValueReadQuery("SELECT " + getQualifiedName(seqName) + ".NEXTVAL FROM DUAL");	484	return new ValueReadQuery("SELECT " + qualifiedSeqName + ".NEXTVAL FROM DUAL");
485	}	485	}
486		486
487	/**	487	/**
488	* INTERNAL:	488	* INTERNAL:
489	* Though Oracle doesn't support identity it could be immitated,	489	* Though Oracle doesn't support identity it could be imitated,
490	* see comment to setSupportsIdentity method.	490	* see comment to setSupportsIdentity method.
491	* @param sequenceName Name known by Oracle to be a defined sequence	491	* @param qualifiedSeqName known by Oracle to be a defined sequence
492	*/	492	*/
493	public ValueReadQuery buildSelectQueryForIdentity(String seqName, Integer size) {	493	public ValueReadQuery buildSelectQueryForIdentity(String qualifiedSeqName, Integer size) {
494	return new ValueReadQuery("SELECT " + getQualifiedName(seqName) + ".CURRVAL FROM DUAL");	494	return new ValueReadQuery("SELECT " + qualifiedSeqName + ".CURRVAL FROM DUAL");
495	}	495	}
496		496
497	/**	497	/**

Lines 40-48 Link Here

(-)foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/sequencing/TableSequence.java (-24 / +1 lines)
40	/** Hold the name of the column in the sequence table which specifies the sequence name */	40	/** Hold the name of the column in the sequence table which specifies the sequence name */
41	protected String nameFieldName = "SEQ_NAME";	41	protected String nameFieldName = "SEQ_NAME";
42		42
43	/** Hold the name of the table qualifier */
44	protected String qualifier = "";
45
46	public TableSequence() {	43	public TableSequence() {
47	super(false, true);	44	super(false, true);
48	setTableName(defaultTableName);	45	setTableName(defaultTableName);
Lines 141-151 Link Here
141	}	138	}
142		139
143	public String getQualifiedTableName() {	140	public String getQualifiedTableName() {
144	if (qualifier.equals("")) {	141	return getQualified(getTableName());
145	return getTableName();
146	} else {
147	return qualifier + "." + getTableName();
148	}
149	}	142	}
150		143
151	public void setTable(DatabaseTable table) {	144	public void setTable(DatabaseTable table) {
Lines 183-202 Link Here
183		176
184	return query;	177	return query;
185	}	178	}
186
187	/**
188	* INTERNAL:
189	*/
190	public void onConnect() {
191	qualifier = getDatasourcePlatform().getTableQualifier();
192	super.onConnect();
193	}
194
195	/**
196	* INTERNAL:
197	*/
198	public void onDisconnect() {
199	super.onDisconnect();
200	qualifier = "";
201	}
202	}	179	}

Lines 33-39 Link Here

(-)foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/sequencing/UnaryTableSequence.java (-3 lines)
33	protected String selectString2;	33	protected String selectString2;
34	protected int updateStringBufferSize;	34	protected int updateStringBufferSize;
35	protected int selectStringBufferSize;	35	protected int selectStringBufferSize;
36	protected String qualifier = "";
37		36
38	public UnaryTableSequence() {	37	public UnaryTableSequence() {
39	super(false, true);	38	super(false, true);
Lines 92-98 Link Here
92	* INTERNAL:	91	* INTERNAL:
93	*/	92	*/
94	public void onConnect() {	93	public void onConnect() {
95	qualifier = getDatasourcePlatform().getTableQualifier();
96	super.onConnect();	94	super.onConnect();
97	initialize();	95	initialize();
98	}	96	}
Lines 103-109 Link Here
103	public void onDisconnect() {	101	public void onDisconnect() {
104	clear();	102	clear();
105	super.onDisconnect();	103	super.onDisconnect();
106	qualifier = "";
107	}	104	}
108		105
109	protected ValueReadQuery buildSelectQuery(String seqName, Integer size) {	106	protected ValueReadQuery buildSelectQuery(String seqName, Integer size) {