Merge pull request #2456 from lanzagar/sql

[FIX] owsql: Fixes for Custom SQL option
biolab · Jul 10, 2017 · 95fe731 · 95fe731
2 parents 84762b4 + f88f2fd
commit 95fe731
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Orange/data/sql/table.py b/Orange/data/sql/table.py
@@ -86,7 +86,7 @@ def __init__(
         if table_or_sql is not None:
             if isinstance(table_or_sql, TableDesc):
                 table = table_or_sql.sql
-            elif "SELECT" in table_or_sql:
+            elif "select" in table_or_sql.lower():
                 table = "(%s) as my_table" % table_or_sql.strip("; ")
             else:
                 table = self.backend.quote_identifier(table_or_sql)

diff --git a/Orange/widgets/data/owsql.py b/Orange/widgets/data/owsql.py
@@ -302,7 +302,7 @@ def get_table(self):
                     with self.backend.execute_sql_query("ANALYZE " + self.materialize_table_name):
                         pass
                     self.table = self.materialize_table_name
-                except psycopg2.ProgrammingError as ex:
+                except (psycopg2.ProgrammingError, BackendError) as ex:
                     self.Error.connection(str(ex))
                     return