Skip to content

Commit a9c05d7

Browse files
committed
Fix some postgres field precision and length inconsistencies
1 parent 2f2e088 commit a9c05d7

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/app/qgsaddattrdialog.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ void QgsAddAttrDialog::setPrecisionMinMax()
8181
int maxPrecType = mTypeBox->itemData( idx, Qt::UserRole + 5 ).toInt();
8282
mPrec->setVisible( minPrecType < maxPrecType );
8383
mPrec->setMinimum( minPrecType );
84-
mPrec->setMaximum( qMin( maxPrecType, mLength->value() ) );
84+
mPrec->setMaximum( qMax( minPrecType, qMin( maxPrecType, mLength->value() ) ) );
8585
}
8686

8787
void QgsAddAttrDialog::accept()

src/providers/postgres/qgspostgresprovider.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,9 @@ QgsPostgresProvider::QgsPostgresProvider( QString const & uri )
157157
//fill type names into sets
158158
mNativeTypes
159159
// integer types
160-
<< QgsVectorDataProvider::NativeType( tr( "Whole number (smallint - 16bit)" ), "int2", QVariant::Int )
161-
<< QgsVectorDataProvider::NativeType( tr( "Whole number (integer - 32bit)" ), "int4", QVariant::Int )
162-
<< QgsVectorDataProvider::NativeType( tr( "Whole number (integer - 64bit)" ), "int8", QVariant::LongLong )
160+
<< QgsVectorDataProvider::NativeType( tr( "Whole number (smallint - 16bit)" ), "int2", QVariant::Int, -1, -1, 0, 0 )
161+
<< QgsVectorDataProvider::NativeType( tr( "Whole number (integer - 32bit)" ), "int4", QVariant::Int, -1, -1, 0, 0 )
162+
<< QgsVectorDataProvider::NativeType( tr( "Whole number (integer - 64bit)" ), "int8", QVariant::LongLong, -1, -1, 0, 0 )
163163
<< QgsVectorDataProvider::NativeType( tr( "Decimal number (numeric)" ), "numeric", QVariant::Double, 1, 20, 0, 20 )
164164
<< QgsVectorDataProvider::NativeType( tr( "Decimal number (decimal)" ), "decimal", QVariant::Double, 1, 20, 0, 20 )
165165

@@ -170,10 +170,10 @@ QgsPostgresProvider::QgsPostgresProvider( QString const & uri )
170170
// string types
171171
<< QgsVectorDataProvider::NativeType( tr( "Text, fixed length (char)" ), "char", QVariant::String, 1, 255 )
172172
<< QgsVectorDataProvider::NativeType( tr( "Text, limited variable length (varchar)" ), "varchar", QVariant::String, 1, 255 )
173-
<< QgsVectorDataProvider::NativeType( tr( "Text, unlimited length (text)" ), "text", QVariant::String )
173+
<< QgsVectorDataProvider::NativeType( tr( "Text, unlimited length (text)" ), "text", QVariant::String, -1, -1, -1, -1 )
174174

175175
// date type
176-
<< QgsVectorDataProvider::NativeType( tr( "Date" ), "date", QVariant::Date )
176+
<< QgsVectorDataProvider::NativeType( tr( "Date" ), "date", QVariant::Date, -1, -1, -1, -1 )
177177
;
178178

179179
QString key;

0 commit comments

Comments
 (0)