You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
22 lines
687 B
22 lines
687 B
13 years ago
|
Index: kexi/kexidb/expression.cpp
|
||
|
|
===================================================================
|
||
|
|
--- kexi/kexidb/expression.cpp (revision 742153)
|
||
|
|
+++ kexi/kexidb/expression.cpp (working copy)
|
||
|
|
@@ -400,14 +400,10 @@
|
||
|
|
if (ltInt && rtInt)
|
||
|
|
return KexiDB::maximumForIntegerTypes(lt, rt);
|
||
|
|
|
||
|
|
- if (Field::isFPNumericType(lt) && rtInt)
|
||
|
|
+ if (Field::isFPNumericType(lt) && (rtInt || lt==rt))
|
||
|
|
return lt;
|
||
|
|
- if (Field::isFPNumericType(rt) && ltInt)
|
||
|
|
+ if (Field::isFPNumericType(rt) && (ltInt || lt==rt))
|
||
|
|
return rt;
|
||
|
|
- if ((lt==Field::Double || lt==Field::Float) && rtInt)
|
||
|
|
- return lt;
|
||
|
|
- if ((rt==Field::Double || rt==Field::Float) && ltInt)
|
||
|
|
- return rt;
|
||
|
|
|
||
|
|
return Field::Boolean;
|
||
|
|
}
|