Add boolean support in OGR provider

qgis · Nov 15, 2017 · cb566178914933d864fad45cf359c6845961dc06 · cb56617
1 parent 6465af3
commit cb566178914933d864fad45cf359c6845961dc06
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 5 deletions.
diff --git a/src/core/qgsogrutils.cpp b/src/core/qgsogrutils.cpp
@@ -129,7 +129,10 @@ QgsFields QgsOgrUtils::readOgrFields( OGRFeatureH ogrFet, QTextCodec *encoding )
     switch ( OGR_Fld_GetType( fldDef ) )
     {
       case OFTInteger:
-        varType = QVariant::Int;
+        if ( OGR_Fld_GetSubType( fldDef ) == OFSTBoolean )
+          varType = QVariant::Bool;
+        else
+          varType = QVariant::Int;
         break;
       case OFTInteger64:
         varType = QVariant::LongLong;
@@ -193,6 +196,7 @@ QVariant QgsOgrUtils::getOgrFeatureAttribute( OGRFeatureH ogrFet, const QgsField
         break;
       }
       case QVariant::Int:
+      case QVariant::Bool:
         value = QVariant( OGR_F_GetFieldAsInteger( ogrFet, attIndex ) );
         break;
       case QVariant::LongLong:

diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -108,6 +108,7 @@ QMap< QString, QDateTime > QgsOgrProviderUtils::mapDSNameToLastModifiedDate;
 bool QgsOgrProvider::convertField( QgsField &field, const QTextCodec &encoding )
 {
   OGRFieldType ogrType = OFTString; //default to string
+  OGRFieldSubType ogrSubType = OFSTNone;
   int ogrWidth = field.length();
   int ogrPrecision = field.precision();
   if ( ogrPrecision > 0 )
@@ -132,6 +133,13 @@ bool QgsOgrProvider::convertField( QgsField &field, const QTextCodec &encoding )
       ogrPrecision = 0;
       break;
 
+    case QVariant::Bool:
+      ogrType = OFTInteger;
+      ogrSubType = OFSTBoolean;
+      ogrWidth = 1;
+      ogrPrecision = 0;
+      break;
+
     case QVariant::Double:
       ogrType = OFTReal;
       break;
@@ -152,7 +160,11 @@ bool QgsOgrProvider::convertField( QgsField &field, const QTextCodec &encoding )
       return false;
   }
 
-  field.setTypeName( encoding.toUnicode( OGR_GetFieldTypeName( ogrType ) ) );
+  if ( ogrSubType != OFSTNone )
+    field.setTypeName( encoding.toUnicode( OGR_GetFieldSubTypeName( ogrSubType ) ) );
+  else
+    field.setTypeName( encoding.toUnicode( OGR_GetFieldTypeName( ogrType ) ) );
+
   field.setLength( ogrWidth );
   field.setPrecision( ogrPrecision );
   return true;
@@ -929,11 +941,19 @@ void QgsOgrProvider::loadFields()
   {
     OGRFieldDefnH fldDef = fdef.GetFieldDefn( i );
     OGRFieldType ogrType = OGR_Fld_GetType( fldDef );
+    OGRFieldSubType ogrSubType = OFSTNone;
+
     QVariant::Type varType;
     switch ( ogrType )
     {
       case OFTInteger:
-        varType = QVariant::Int;
+        if ( OGR_Fld_GetSubType( fldDef ) == OFSTBoolean )
+        {
+          varType = QVariant::Bool;
+          ogrSubType = OFSTBoolean;
+        }
+        else
+          varType = QVariant::Int;
         break;
       case OFTInteger64:
         varType = QVariant::LongLong;
@@ -979,13 +999,17 @@ void QgsOgrProvider::loadFields()
     if ( prec > 0 )
       width -= 1;
 
+    QString typeName = OGR_GetFieldTypeName( ogrType );
+    if ( ogrSubType != OFSTNone )
+      typeName = OGR_GetFieldSubTypeName( ogrSubType );
+
     QgsField newField = QgsField(
                           name,
                           varType,
 #ifdef ANDROID
-                          OGR_GetFieldTypeName( ogrType ),
+                          typeName,
 #else
-                          textEncoding()->toUnicode( OGR_GetFieldTypeName( ogrType ) ),
+                          textEncoding()->toUnicode( typeName.toStdString().c_str() ),
 #endif
                           width, prec
                         );
@@ -1474,6 +1498,7 @@ bool QgsOgrProvider::addAttributes( const QList<QgsField> &attributes )
     switch ( iter->type() )
     {
       case QVariant::Int:
+      case QVariant::Bool:
         type = OFTInteger;
         break;
       case QVariant::LongLong:
@@ -1515,6 +1540,14 @@ bool QgsOgrProvider::addAttributes( const QList<QgsField> &attributes )
     OGR_Fld_SetWidth( fielddefn.get(), width );
     OGR_Fld_SetPrecision( fielddefn.get(), iter->precision() );
 
+    switch ( iter->type() )
+    {
+      case QVariant::Bool:
+        OGR_Fld_SetSubType( fielddefn.get(), OFSTBoolean );
+      default:
+        break;
+    }
+
     if ( mOgrLayer->CreateField( fielddefn.get(), true ) != OGRERR_NONE )
     {
       pushError( tr( "OGR error creating field %1: %2" ).arg( iter->name(), CPLGetLastErrorMsg() ) );