diff --git a/apps/ogr2ogr_lib.cpp b/apps/ogr2ogr_lib.cpp index 19734944335d..6b8543d18590 100644 --- a/apps/ogr2ogr_lib.cpp +++ b/apps/ogr2ogr_lib.cpp @@ -4625,6 +4625,8 @@ SetupTargetLayer::Setup(OGRLayer *poSrcLayer, const char *pszNewLayerName, oCoordPrec.dfMResolution = psOptions->dfMRes; } + auto poSrcDriver = m_poSrcDS->GetDriver(); + // Force FID column as 64 bit if the source feature has a 64 bit FID, // the target driver supports 64 bit FID and the user didn't set it // manually. @@ -4667,9 +4669,8 @@ SetupTargetLayer::Setup(OGRLayer *poSrcLayer, const char *pszNewLayerName, } // Detect scenario of converting from GPX to a format like GPKG // Cf https://github.com/OSGeo/gdal/issues/9225 - else if (!bPreserveFID && !m_bUnsetFid && !bAppend && - m_poSrcDS->GetDriver() && - EQUAL(m_poSrcDS->GetDriver()->GetDescription(), "GPX") && + else if (!bPreserveFID && !m_bUnsetFid && !bAppend && poSrcDriver && + EQUAL(poSrcDriver->GetDescription(), "GPX") && pszDestCreationOptions && (strstr(pszDestCreationOptions, "='FID'") != nullptr || strstr(pszDestCreationOptions, "=\"FID\"") != nullptr) && @@ -4761,6 +4762,23 @@ SetupTargetLayer::Setup(OGRLayer *poSrcLayer, const char *pszNewLayerName, } } + // Use case of https://github.com/OSGeo/gdal/issues/11057#issuecomment-2495479779 + // Conversion from GPKG to OCI. + // OCI distinguishes between TIMESTAMP and TIMESTAMP WITH TIME ZONE + // GeoPackage is supposed to have DateTime in UTC, so we set + // TIMESTAMP_WITH_TIME_ZONE=YES + if (poSrcDriver && pszDestCreationOptions && + strstr(pszDestCreationOptions, "TIMESTAMP_WITH_TIME_ZONE") && + CSLFetchNameValue(m_papszLCO, "TIMESTAMP_WITH_TIME_ZONE") == + nullptr && + EQUAL(poSrcDriver->GetDescription(), "GPKG")) + { + papszLCOTemp = CSLSetNameValue(papszLCOTemp, + "TIMESTAMP_WITH_TIME_ZONE", "YES"); + CPLDebug("GDALVectorTranslate", + "Setting TIMESTAMP_WITH_TIME_ZONE=YES"); + } + OGRGeomFieldDefn oGeomFieldDefn( osGeomFieldName.c_str(), static_cast(eGCreateLayerType)); @@ -4956,7 +4974,9 @@ SetupTargetLayer::Setup(OGRLayer *poSrcLayer, const char *pszNewLayerName, bool bError = false; OGRArrowArrayStream streamSrc; + const bool bUseWriteArrowBatch = + !EQUAL(m_poDstDS->GetDriver()->GetDescription(), "OCI") && CanUseWriteArrowBatch(poSrcLayer, poDstLayer, bJustCreatedLayer, psOptions, bPreserveFID, bError, streamSrc); if (bError) diff --git a/autotest/ogr/ogr_oci.py b/autotest/ogr/ogr_oci.py index 02e3683cbea4..205caa8b4ff6 100755 --- a/autotest/ogr/ogr_oci.py +++ b/autotest/ogr/ogr_oci.py @@ -70,6 +70,7 @@ def setup_tests(): gdaltest.oci_ds.ExecuteSQL("DELLAYER:test_GEOMETRYCOLLECTION") gdaltest.oci_ds.ExecuteSQL("DELLAYER:test_NONE") gdaltest.oci_ds.ExecuteSQL("DELLAYER:testdate") + gdaltest.oci_ds.ExecuteSQL("DELLAYER:testdate_with_tz") gdaltest.oci_ds.ExecuteSQL("DELLAYER:ogr_oci_20") gdaltest.oci_ds.ExecuteSQL("DELLAYER:ogr_oci_20bis") gdaltest.oci_ds.ExecuteSQL("DELLAYER:ogr_oci_21") @@ -724,7 +725,7 @@ def test_ogr_oci_18(): # Test date / datetime -def test_ogr_oci_19(): +def test_ogr_oci_datetime_no_tz(): lyr = gdaltest.oci_ds.CreateLayer("testdate", geom_type=ogr.wkbNone) lyr.CreateField(ogr.FieldDefn("MYDATE", ogr.OFTDate)) @@ -736,6 +737,9 @@ def test_ogr_oci_19(): feat = ogr.Feature(lyr.GetLayerDefn()) feat.SetField("MYDATETIME", "2015/02/03 11:33:44.12345") lyr.CreateFeature(feat) + feat = ogr.Feature(lyr.GetLayerDefn()) + feat.SetField("MYDATETIME", "2015/02/03 11:33:44.12345+0530") # Timezone lost + lyr.CreateFeature(feat) lyr.SyncToDisk() with gdaltest.oci_ds.ExecuteSQL( @@ -743,11 +747,55 @@ def test_ogr_oci_19(): ) as sql_lyr: assert sql_lyr.GetLayerDefn().GetFieldDefn(0).GetType() == ogr.OFTDate assert sql_lyr.GetLayerDefn().GetFieldDefn(1).GetType() == ogr.OFTDateTime + assert sql_lyr.GetLayerDefn().GetFieldDefn(1).GetTZFlag() == ogr.TZFLAG_UNKNOWN f = sql_lyr.GetNextFeature() assert f.GetField(0) == "2015/02/03" assert f.GetField(1) == "2015/02/03 11:33:44" f = sql_lyr.GetNextFeature() assert f.GetField(1) == "2015/02/03 11:33:44.123" + f = sql_lyr.GetNextFeature() + assert f.GetField(1) == "2015/02/03 11:33:44.123" # Timezone lost + + +############################################################################### +# Test date / datetime with time zone + + +def test_ogr_oci_datetime_with_tz(): + + lyr = gdaltest.oci_ds.CreateLayer( + "testdate_with_tz", + geom_type=ogr.wkbNone, + options=["TIMESTAMP_WITH_TIME_ZONE=YES"], + ) + lyr.CreateField(ogr.FieldDefn("MYDATETIME", ogr.OFTDateTime)) + feat = ogr.Feature(lyr.GetLayerDefn()) + feat.SetField("MYDATETIME", "2015/02/03 11:33:44+0530") + lyr.CreateFeature(feat) + feat = ogr.Feature(lyr.GetLayerDefn()) + feat.SetField("MYDATETIME", "2015/02/03 11:33:44-0530") + lyr.CreateFeature(feat) + feat = ogr.Feature(lyr.GetLayerDefn()) + feat.SetField("MYDATETIME", "2015/02/03 11:33:44+00") + lyr.CreateFeature(feat) + feat = ogr.Feature(lyr.GetLayerDefn()) + feat.SetField("MYDATETIME", "2015/02/03 11:33:44") # UTC assumed... + lyr.CreateFeature(feat) + lyr.SyncToDisk() + + with gdaltest.oci_ds.ExecuteSQL( + "SELECT MYDATETIME FROM testdate_with_tz" + ) as sql_lyr: + assert sql_lyr.GetLayerDefn().GetFieldDefn(0).GetType() == ogr.OFTDateTime + assert sql_lyr.GetLayerDefn().GetFieldDefn(0).GetTZFlag() == ogr.TZFLAG_MIXED_TZ + f = sql_lyr.GetNextFeature() + assert f.GetField(0) == "2015/02/03 11:33:44+0530" + f = sql_lyr.GetNextFeature() + assert f.GetField(0) == "2015/02/03 11:33:44-0530" + f = sql_lyr.GetNextFeature() + assert f.GetField(0) == "2015/02/03 11:33:44+00" + f = sql_lyr.GetNextFeature() + assert f.GetField(0) == "2015/02/03 11:33:44+00" # UTC assumed... ############################################################################### diff --git a/doc/source/drivers/vector/oci.rst b/doc/source/drivers/vector/oci.rst index 764767c2c9d5..ae09ee944201 100644 --- a/doc/source/drivers/vector/oci.rst +++ b/doc/source/drivers/vector/oci.rst @@ -288,6 +288,17 @@ The following layer creation options are supported: name, it can be supplied with the GEOMETRY_NAME layer creation option. +- .. lco:: TIMESTAMP_WITH_TIME_ZONE + :choices: YES, NO + :default: NO + :since: 3.10.1 + + Whether DateTime fields should be created with TIMESTAMP WITH TIME ZONE + Oracle type (otherwise without timezone). + When creating a field, if it advertizes a known or mixed time zone, + TIMESTAMP_WITH_TIME_ZONE wil default to YES, otherwise it will default to + NO. + Layer Open Options ~~~~~~~~~~~~~~~~~~ diff --git a/ogr/ogrsf_frmts/oci/ogr_oci.h b/ogr/ogrsf_frmts/oci/ogr_oci.h index 616822136fd7..a8d483ed469b 100644 --- a/ogr/ogrsf_frmts/oci/ogr_oci.h +++ b/ogr/ogrsf_frmts/oci/ogr_oci.h @@ -19,6 +19,7 @@ #include "cpl_error.h" #include +#include /* -------------------------------------------------------------------- */ /* Low level Oracle spatial declarations. */ @@ -246,6 +247,8 @@ class OGROCILayer CPL_NON_FINAL : public OGRLayer char *pszFIDName; int iFIDColumn; + std::set setFieldIndexWithTimeStampWithTZ{}; + OGRGeometry *TranslateGeometry(); OGRGeometry *TranslateGeometryElement(int *piElement, int nGType, int nDimension, int nEType, diff --git a/ogr/ogrsf_frmts/oci/ogrocidrivercore.cpp b/ogr/ogrsf_frmts/oci/ogrocidrivercore.cpp index b1432a1150a9..80a445636eed 100644 --- a/ogr/ogrsf_frmts/oci/ogrocidrivercore.cpp +++ b/ogr/ogrsf_frmts/oci/ogrocidrivercore.cpp @@ -107,6 +107,9 @@ void OGROCIDriverSetCommonMetadata(GDALDriver *poDriver) "