Selaa lähdekoodia

HUE-3647 [editor] SELECT statement that starts with a comment cannot be saved to table

Romain Rigaux 9 vuotta sitten
vanhempi
commit
8174f3657d

+ 2 - 2
desktop/libs/notebook/src/notebook/connectors/hiveserver2.py

@@ -414,7 +414,7 @@ class HS2Api(Api):
     session = self._get_session(notebook, snippet['type'])
     query = self._prepare_hql_query(snippet, response.pop('statement'), session)
 
-    if not query.hql_query.strip().lower().startswith('select'):
+    if 'select' not in query.hql_query.strip().lower():
       raise Exception(_('Only SELECT statements can be saved. Provided statement: %(query)s') % {'query': query.hql_query})
 
     database = snippet.get('database') or 'default'
@@ -438,7 +438,7 @@ class HS2Api(Api):
     session = self._get_session(notebook, snippet['type'])
     query = self._prepare_hql_query(snippet, response.pop('statement'), session)
 
-    if not query.hql_query.strip().lower().startswith('select'):
+    if 'select' not in query.hql_query.strip().lower():
       raise Exception(_('Only SELECT statements can be saved. Provided statement: %(query)s') % {'query': query.hql_query})
 
     db.use(query.database)

+ 1 - 1
desktop/libs/notebook/src/notebook/connectors/oozie_batch.py

@@ -56,7 +56,7 @@ class OozieApi(Api):
       raise PopupException(_('Oozie batch submission only accepts Hive queries at this time.'))
 
     # Create a managed workflow from the notebook doc
-    workflow_doc = WorkflowBuilder().create_workflow(document=notebook_doc, user=self.user, managed=True, name=_("Batch job for %s") % notebook_doc.name)
+    workflow_doc = WorkflowBuilder().create_workflow(document=notebook_doc, user=self.user, managed=True, name=_("Batch job for %s") % notebook_doc.name or notebook_doc.type)
     workflow = Workflow(document=workflow_doc)
 
     # Submit workflow