-
Notifications
You must be signed in to change notification settings - Fork 174
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Adds support for Oracle 23c database.
There are following changes
- Oracle23Platform.java platform classes added
- New Oracle JDBC driver 23.x.x.x has, in some cases, different behaviour for boolean type. There are changes in PL/SQL calls.
- When empty String ("") is inserted into table column like ...CLOBDATA CLOB NOT NULL...
Solution is based on conversion into java.sql.Clob, because solution based on SimpleAppendCallCustomParameter("empty_clob()") and DatabasePlatform.appendParameter() leads into another test failures.
- Fix for loss of precision if DB table is automatically created if entity using java.time.LocalDateTime, java.time.LocalTime.
- JDBC Driver update
Signed-off-by: Radek Felcman <[email protected]>- Loading branch information
Showing
13 changed files
with
270 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
74 changes: 74 additions & 0 deletions
74
...ipse.persistence.core/src/org/eclipse/persistence/platform/database/Oracle23Platform.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| /* | ||
| * Copyright (c) 2023 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 | ||
| * http://www.eclipse.org/legal/epl-2.0, | ||
| * or the Eclipse Distribution License v. 1.0 which is available at | ||
| * http://www.eclipse.org/org/documents/edl-v10.php. | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause | ||
| */ | ||
|
|
||
| // Contributors: | ||
| // Oracle - initial API and implementation | ||
| package org.eclipse.persistence.platform.database; | ||
|
|
||
| import org.eclipse.persistence.exceptions.ConversionException; | ||
| import org.eclipse.persistence.exceptions.DatabaseException; | ||
| import org.eclipse.persistence.internal.databaseaccess.FieldTypeDefinition; | ||
| import org.eclipse.persistence.internal.helper.ClassConstants; | ||
| import org.eclipse.persistence.internal.sessions.AbstractSession; | ||
|
|
||
| import java.sql.Clob; | ||
| import java.sql.Connection; | ||
| import java.sql.SQLException; | ||
| import java.util.Hashtable; | ||
|
|
||
| import static org.eclipse.persistence.internal.helper.StringHelper.EMPTY_STRING; | ||
|
|
||
| public class Oracle23Platform extends Oracle21Platform { | ||
| public Oracle23Platform() { | ||
| super(); | ||
| } | ||
|
|
||
| @Override | ||
| protected Hashtable<Class<?>, FieldTypeDefinition> buildFieldTypes() { | ||
| Hashtable<Class<?>, FieldTypeDefinition> fieldTypes = super.buildFieldTypes(); | ||
| fieldTypes.put(java.time.LocalDateTime.class, new FieldTypeDefinition("TIMESTAMP", 9)); | ||
| fieldTypes.put(java.time.LocalTime.class, new FieldTypeDefinition("TIMESTAMP", 9)); | ||
| return fieldTypes; | ||
| } | ||
|
|
||
| /** | ||
| * INTERNAL: | ||
| * Check whether current platform is Oracle 23c or later. | ||
| * @return Always returns {@code true} for instances of Oracle 23c platform. | ||
| * @since 2.7.14 | ||
| */ | ||
| @Override | ||
| public boolean isOracle23() { | ||
| return true; | ||
| } | ||
|
|
||
| /** | ||
| * INTERNAL: | ||
| * Allow for conversion from the Oracle type to the Java type. Used in cases when DB connection is needed like BLOB, CLOB. | ||
| */ | ||
| @Override | ||
| public Object convertObject(Object sourceObject, Class javaClass, AbstractSession session) throws ConversionException, DatabaseException { | ||
| //Handle special case when empty String ("") is passed from the entity into CLOB type column | ||
| if (ClassConstants.CLOB.equals(javaClass) && sourceObject instanceof String && EMPTY_STRING.equals(sourceObject)) { | ||
| Connection connection = session.getAccessor().getConnection(); | ||
| Clob clob = null; | ||
| try { | ||
| clob = connection.createClob(); | ||
| clob.setString(1, (String)sourceObject); | ||
| } catch (SQLException e) { | ||
| throw ConversionException.couldNotBeConvertedToClass(sourceObject, ClassConstants.CLOB, e); | ||
| } | ||
| return clob; | ||
| } | ||
| return super.convertObject(sourceObject, javaClass); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
84 changes: 84 additions & 0 deletions
84
...istence.oracle/src/org/eclipse/persistence/platform/database/oracle/Oracle23Platform.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| /* | ||
| * Copyright (c) 2023 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 | ||
| * http://www.eclipse.org/legal/epl-2.0, | ||
| * or the Eclipse Distribution License v. 1.0 which is available at | ||
| * http://www.eclipse.org/org/documents/edl-v10.php. | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause | ||
| */ | ||
|
|
||
| // Contributors: | ||
| // Oracle - initial API and implementation | ||
| package org.eclipse.persistence.platform.database.oracle; | ||
|
|
||
| import org.eclipse.persistence.exceptions.ConversionException; | ||
| import org.eclipse.persistence.exceptions.DatabaseException; | ||
| import org.eclipse.persistence.internal.databaseaccess.FieldTypeDefinition; | ||
| import org.eclipse.persistence.internal.helper.ClassConstants; | ||
| import org.eclipse.persistence.internal.sessions.AbstractSession; | ||
|
|
||
| import java.sql.Clob; | ||
| import java.sql.Connection; | ||
| import java.sql.SQLException; | ||
| import java.util.Hashtable; | ||
|
|
||
| import static org.eclipse.persistence.internal.helper.StringHelper.EMPTY_STRING; | ||
|
|
||
| /** | ||
| * <p><b>Purpose:</b> | ||
| * Supports certain new Oracle 23c data types, and usage of certain Oracle JDBC specific APIs. | ||
| * <p> Supports Oracle JSON data type. | ||
| * <p> Supports Oracle OracleJsonValue derived Java types. | ||
| */ | ||
| public class Oracle23Platform extends Oracle21Platform { | ||
|
|
||
| /** | ||
| * Creates an instance of Oracle 23c database platform. | ||
| */ | ||
| public Oracle23Platform() { | ||
| super(); | ||
| } | ||
|
|
||
| /** | ||
| * INTERNAL: | ||
| * Check whether current platform is Oracle 23c or later. | ||
| * @return Always returns {@code true} for instances of Oracle 23c platform. | ||
| * @since 4.0.2 | ||
| */ | ||
| @Override | ||
| public boolean isOracle23() { | ||
| return true; | ||
| } | ||
|
|
||
| @Override | ||
| protected Hashtable<Class<?>, FieldTypeDefinition> buildFieldTypes() { | ||
| Hashtable<Class<?>, FieldTypeDefinition> fieldTypes = super.buildFieldTypes(); | ||
| fieldTypes.put(java.time.LocalDateTime.class, new FieldTypeDefinition("TIMESTAMP", 9)); | ||
| fieldTypes.put(java.time.LocalTime.class, new FieldTypeDefinition("TIMESTAMP", 9)); | ||
| return fieldTypes; | ||
| } | ||
|
|
||
| /** | ||
| * INTERNAL: | ||
| * Allow for conversion from the Oracle type to the Java type. Used in cases when DB connection is needed like BLOB, CLOB. | ||
| */ | ||
| @Override | ||
| public Object convertObject(Object sourceObject, Class javaClass, AbstractSession session) throws ConversionException, DatabaseException { | ||
| //Handle special case when empty String ("") is passed from the entity into CLOB type column | ||
| if (ClassConstants.CLOB.equals(javaClass) && sourceObject instanceof String && EMPTY_STRING.equals(sourceObject)) { | ||
| Connection connection = session.getAccessor().getConnection(); | ||
| Clob clob = null; | ||
| try { | ||
| clob = connection.createClob(); | ||
| clob.setString(1, (String)sourceObject); | ||
| } catch (SQLException e) { | ||
| throw ConversionException.couldNotBeConvertedToClass(sourceObject, ClassConstants.CLOB, e); | ||
| } | ||
| return clob; | ||
| } | ||
| return super.convertObject(sourceObject, javaClass); | ||
| } | ||
| } |
Oops, something went wrong.