Revert fix for bug 426852 which caused issues in existing applications (#2646)

* Revert fix for bug 426852 which caused issues in existing applications
Signed-off-by: Vaibhav Vishal vaibhav.vishal@oracle.com

Author: vavishal

foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/databaseaccess/DatasourcePlatform.java

@@ -13,8 +13,6 @@
 
 // Contributors:
 //     Oracle - initial API and implementation from Oracle TopLink
-//     09/29/2016-2.7 Tomas Kraus
-//       - 426852: @GeneratedValue(strategy=GenerationType.IDENTITY) support in Oracle 12c
 //     09/14/2017-2.6 Will Dazey
 //       - 522312: Add the eclipselink.sequencing.start-sequence-at-nextval property
 //     02/20/2018-2.7 Will Dazey
@@ -44,15 +42,13 @@
 import org.eclipse.persistence.sequencing.DefaultSequence;
 import org.eclipse.persistence.sequencing.QuerySequence;
 import org.eclipse.persistence.sequencing.Sequence;
-import org.eclipse.persistence.sessions.Session;
 
 import java.io.IOException;
 import java.io.Writer;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 /**
  * DatasourcePlatform is private to TopLink. It encapsulates behavior specific to a datasource platform
@@ -1177,28 +1173,6 @@ public DatasourceCall buildNativeCall(String queryString) {
         return new SQLCall(queryString);
     }
 
-    /**
-     * INTERNAL:
-     * Initialize platform specific identity sequences.
-     * @param session Active database session (in connected state).
-     * @param defaultIdentityGenerator Default identity generator sequence name.
-     * @since 2.7
-     */
-    public void initIdentitySequences(final Session session, final String defaultIdentityGenerator) {
-    }
-
-    /**
-     * INTERNAL:
-     * Remove platform specific identity sequences for specified tables. Default identity sequences are restored.
-     * @param session Active database session (in connected state).
-     * @param defaultIdentityGenerator Default identity generator sequence name.
-     * @param tableNames Set of table names to check for identity sequence removal.
-     * @since 2.7
-     */
-    public void removeIdentitySequences(
-            final Session session, final String defaultIdentityGenerator, final Set<String> tableNames) {
-    }
-
     /**
      * INTERNAL:
      * Override this method if the platform needs to use a custom function based on the DatabaseField

foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/databaseaccess/Platform.java

@@ -23,7 +23,6 @@
 import org.eclipse.persistence.queries.Call;
 import org.eclipse.persistence.queries.ValueReadQuery;
 import org.eclipse.persistence.sequencing.Sequence;
-import org.eclipse.persistence.sessions.Session;
 
 import java.io.Serializable;
 import java.io.Writer;
@@ -289,29 +288,6 @@ public interface Platform extends CorePlatform<ConversionManager>, Serializable,
      */
     boolean usesPlatformDefaultSequence();
 
-    /**
-     * INTERNAL:
-     * Initialize platform specific identity sequences.
-     * This method is called from {@code EntityManagerSetupImpl} after login and optional schema generation.
-     * Method is also called from {@code TableCreator} class during tables creation and update..
-     * @param session Active database session (in connected state).
-     * @param defaultIdentityGenerator Default identity generator sequence name.
-     * @since 2.7
-     */
-    void initIdentitySequences(final Session session, final String defaultIdentityGenerator);
-
-    /**
-     * INTERNAL:
-     * Remove platform specific identity sequences for specified tables. Default identity sequences are restored.
-     * Method is also called from {@code TableCreator} class during tables removal.
-     * @param session Active database session (in connected state).
-     * @param defaultIdentityGenerator Default identity generator sequence name.
-     * @param tableNames Set of table names to check for identity sequence removal.
-     * @since 2.7
-     */
-    void removeIdentitySequences(
-            final Session session, final String defaultIdentityGenerator, final Set<String> tableNames);
-
     /**
      * INTERNAL:
      * Get platform specific connection properties.

foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/localization/i18n/TraceLocalizationResource.java

@@ -511,8 +511,6 @@ The thread is working in the context of (CacheKey) = ({2}) .\s
         { "dbPlatformHelper_detectedVendorPlatform", "Detected database platform: {0}"},
         { "dbPlatformHelper_regExprDbPlatform", "Database platform: {1}, regular expression: {0}"},
         { "dbPlatformHelper_patternSyntaxException", "Exception while using regular expression: {0}" },
-        { "platform_ora_init_id_seq", "Init Oracle identity sequence {0} -> {1} for table {2}"},
-        { "platform_ora_remove_id_seq", "Remove Oracle identity sequence {0} -> {1} for table {2}"},
         { "unknown_query_hint", "query {0}: unknown query hint {1} will be ignored"},
         { "query_hint", "query {0}: query hint {1}; value {2}"},
         { "property_value_specified", "property={0}; value={1}"},

foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/tools/schemaframework/TableCreator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2025 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2026 Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020 IBM Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -53,10 +53,6 @@
  * @author Peter Krogh
  */
 public class TableCreator {
-    /** Default identity generator sequence name.
-     *  Copy of value from JPA: {@code MetadataProject.DEFAULT_IDENTITY_GENERATOR}. */
-    public static final String DEFAULT_IDENTITY_GENERATOR = "SEQ_GEN_IDENTITY";
-
     /** Flag to disable table existence check before create. */
     public static boolean CHECK_EXISTENCE = true;
 
@@ -206,7 +202,6 @@ public void createTables(final DatabaseSession session, final SchemaManager sche
         createConstraints(missingTables, session, schemaManager, false);
 
         schemaManager.createOrReplaceSequences(createSequenceTables, createSequences);
-        session.getDatasourcePlatform().initIdentitySequences(session, DEFAULT_IDENTITY_GENERATOR);
     }
 
     /**
@@ -300,7 +295,6 @@ public void dropTables(final DatabaseSession session, final SchemaManager schema
                         }
                     }
                 }
-                session.getDatasourcePlatform().removeIdentitySequences(session, DEFAULT_IDENTITY_GENERATOR, tableNames);
                 tables = failed;
             }
         } finally {
@@ -681,8 +675,6 @@ public void extendTables(final DatabaseSession session, final SchemaManager sche
         createConstraints(session, schemaManager, false);
 
         schemaManager.createSequences();
-        session.getDatasourcePlatform().initIdentitySequences(session, DEFAULT_IDENTITY_GENERATOR);
-
     }
 
     // Reads column information from the database.

foundation/org.eclipse.persistence.oracle/src/main/java/org/eclipse/persistence/platform/database/oracle/Oracle12Platform.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2024 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -12,8 +12,6 @@
 
 // Contributors:
 //     Oracle - initial API and implementation from Oracle TopLink
-//     09/29/2016-2.7 Tomas Kraus
-//       - 426852: @GeneratedValue(strategy=GenerationType.IDENTITY) support in Oracle 12c
 package org.eclipse.persistence.platform.database.oracle;
 
 import java.io.IOException;
@@ -24,37 +22,22 @@
 import java.sql.SQLException;
 import java.sql.Struct;
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
 
-import org.eclipse.persistence.descriptors.ClassDescriptor;
 import org.eclipse.persistence.exceptions.ValidationException;
 import org.eclipse.persistence.internal.helper.ClassConstants;
 import org.eclipse.persistence.internal.helper.DatabaseField;
 import org.eclipse.persistence.internal.sessions.AbstractRecord;
 import org.eclipse.persistence.internal.sessions.AbstractSession;
-import org.eclipse.persistence.logging.SessionLog;
 import org.eclipse.persistence.queries.ValueReadQuery;
-import org.eclipse.persistence.sequencing.NativeSequence;
-import org.eclipse.persistence.sequencing.Sequence;
-import org.eclipse.persistence.sessions.Session;
 
 /**
  * <p><b>Purpose:</b>
- * Supports usage of certain Oracle JDBC specific APIs for the Oracle 12 database.<br>
- * Identity column:<br>
- * {@code GENERATED [ ALWAYS | BY DEFAULT [ ON NULL ] ] AS IDENTITY [ ( identity_options ) ]}
+ * Supports usage of certain Oracle JDBC specific APIs for the Oracle 12 database.
  */
 public class Oracle12Platform extends Oracle11Platform {
 
-    /** Table name to identity sequence name storage. */
-    private final Map<String, String> identitySequences;
-
     public Oracle12Platform() {
         super();
-        supportsIdentity = true;
-        identitySequences = new ConcurrentHashMap<>();
     }
 
     /**
@@ -68,83 +51,6 @@ public boolean isOracle12() {
         return true;
     }
 
-    /**
-     * INTERNAL:
-     * Initialize platform specific identity sequences.
-     * @param session Active database session (in connected state).
-     * @param defaultIdentityGenerator Default identity generator sequence name.
-     * @since 2.7
-     */
-    @Override
-    public void initIdentitySequences(final Session session, final String defaultIdentityGenerator) {
-        if (sequences != null && sequences.containsKey(defaultIdentityGenerator)) {
-            for (final ClassDescriptor descriptor : session.getDescriptors().values()) {
-                final Sequence sequence = descriptor.getSequence();
-                if (sequence != null && defaultIdentityGenerator.equals(sequence.getName())) {
-                    final String tableName = descriptor.getTableName();
-                    final String seqName = getIdentitySequence(tableName, session);
-                    if (seqName != null) {
-                        final NativeSequence newSequence = new NativeSequence(seqName, 1, true);
-                        newSequence.setShouldAcquireValueAfterInsert(true);
-                        newSequence.onConnect(this);
-                        descriptor.setSequence(newSequence);
-                        descriptor.setSequenceNumberName(seqName);
-                        identitySequences.put(tableName, seqName);
-                        addSequence(newSequence);
-                        if (session.getSessionLog().shouldLog(SessionLog.FINE)) {
-                            session.getSessionLog().log(SessionLog.FINE, "platform_ora_init_id_seq",
-                                    new Object[] {defaultIdentityGenerator, seqName, tableName});
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * INTERNAL:
-     * Remove platform specific identity sequence for specified table. Default identity sequence is restored.
-     * @param session Active database session (in connected state).
-     * @param defaultIdentityGenerator Default identity generator sequence name.
-     * @param tableNames Set of table names to check for identity sequence removal.
-     * @since 2.7
-     */
-    @Override
-    public void removeIdentitySequences(final Session session, final String defaultIdentityGenerator, final Set<String> tableNames) {
-        if (sequences != null && sequences.containsKey(defaultIdentityGenerator)) {
-            final Sequence defaultSeq = getSequence(defaultIdentityGenerator);
-            for (final ClassDescriptor descriptor : session.getDescriptors().values()) {
-                final String tableName = descriptor.getTableName();
-                if (tableName != null && identitySequences.containsKey(tableName)) {
-                    final String seqName = identitySequences.remove(tableName);
-                    removeSequence(seqName);
-                    descriptor.setSequence(defaultSeq);
-                    descriptor.setSequenceNumberName(defaultIdentityGenerator);
-                    if (session.getSessionLog().shouldLog(SessionLog.FINE)) {
-                        session.getSessionLog().log(SessionLog.FINE, "platform_ora_remove_id_seq",
-                                new Object[] {seqName, defaultIdentityGenerator, tableName});
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Get sequence name corresponding to the table name.
-     * @param tableName Name of the table.
-     * @param session Active data source session.
-     * @return Sequence name corresponding to the table name or {@code null} if no such sequence exists.
-     * @since 2.7
-     */
-    private String getIdentitySequence(final String tableName, final Session session) {
-        // TABLE_NAME values are converted to upper case by default.
-        // Also TableDefinition.buildCreationWriter(AbstractSession,Writer) does not have support for quoting table names
-        // to make them case sensitive on Oracle DB.
-        final String sql = "SELECT SEQUENCE_NAME FROM USER_TAB_IDENTITY_COLS WHERE TABLE_NAME='" + tableName.toUpperCase() + "'";
-        final ValueReadQuery query = new ValueReadQuery(sql);
-        return (String) session.executeQuery(query);
-    }
-
     /**
      * INTERNAL:
      * Append the receiver's field 'identity' constraint clause to a writer.