Merge pull request #3109 from robertcv/fix_sql_char

[FIX] postgres: Fix wrong discrete values

Author: lanzagar

Orange/data/sql/backend/postgres.py

@@ -165,6 +165,8 @@ def _guess_variable(self, field_name, field_metadata, inspect_table):
         if type_code in CHAR_TYPES:
             if inspect_table:
                 values = self.get_distinct_values(field_name, inspect_table)
+                # remove trailing spaces
+                values = [v.rstrip() for v in values]
                 if values:
                     return DiscreteVariable.make(field_name, values)
 

Orange/tests/sql/test_sql_table.py

@@ -346,6 +346,14 @@ def test_discrete_char(self):
         sql_table = SqlTable(conn, table_name, inspect_values=True)
         self.assertFirstAttrIsInstance(sql_table, DiscreteVariable)
 
+    def test_discrete_bigger_char(self):
+        """Test if the discrete values are the same for bigger char fields"""
+        table = np.array(['M', 'F', 'M', 'F', 'M', 'F']).reshape(-1, 1)
+        conn, table_name = self.create_sql_table(table, ['char(10)'])
+
+        sql_table = SqlTable(conn, table_name, inspect_values=True)
+        self.assertSequenceEqual(sql_table.domain[0].values, ['F', 'M'])
+
     def test_meta_char(self):
         table = np.array(list('ABCDEFGHIJKLMNOPQRSTUVW')).reshape(-1, 1)
         conn, table_name = self.create_sql_table(table, ['char(1)'])