瀏覽代碼

HUE-4949 [editor] Add LIMIT 100 to drag & drop table from assist

Also replace DELETE by DROP TABLE as more handy
Romain Rigaux 9 年之前
父節點
當前提交
126a764db8

+ 3 - 3
desktop/core/src/desktop/static/desktop/js/ko.hue-bindings.js

@@ -3267,7 +3267,7 @@
       });
 
       $tableDropMenu.find('.editor-drop-select').click(function () {
-        setFromDropMenu('SELECT * FROM ' + lastMeta.table + ';');
+        setFromDropMenu('SELECT * FROM ' + lastMeta.table + ' LIMIT 100;');
         $tableDropMenu.hide();
       });
 
@@ -3279,8 +3279,8 @@
         setFromDropMenu('UPDATE ' + lastMeta.table + ' SET ');
       });
 
-      $tableDropMenu.find('.editor-drop-delete').click(function () {
-        setFromDropMenu('DELETE FROM ' + lastMeta.table + ' WHERE ');
+      $tableDropMenu.find('.editor-drop-drop').click(function () {
+        setFromDropMenu('DROP TABLE ' + lastMeta.table + ';');
       });
 
       var draggableMeta = {};

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

@@ -639,7 +639,7 @@ class HS2Api(Api):
   def get_select_star_query(self, snippet, database, table):
     db = self._get_db(snippet)
     table = db.get_table(database, table)
-    return db.get_select_star_query(database, table)
+    return db.get_select_star_query(database, table, limit=1000)
 
 
   def _get_handle(self, snippet):

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

@@ -155,7 +155,7 @@ class RdbmsApi(Api):
 
   @query_error_handler
   def get_select_star_query(self, snippet, database, table):
-    return "SELECT * FROM `%s`.`%s`" % (database, table)
+    return "SELECT * FROM `%s`.`%s` LIMIT 1000" % (database, table)
 
 
 class Assist():

+ 1 - 1
desktop/libs/notebook/src/notebook/templates/editor_components.mako

@@ -1578,7 +1578,7 @@ ${ hueIcons.symbols() }
         <li class="editor-drop-select"><a href="javascript:void(0);">SELECT FROM <span class="editor-drop-identifier"></span>...</a></li>
         <li class="editor-drop-insert"><a href="javascript:void(0);">INSERT INTO <span class="editor-drop-identifier"></span>...</a></li>
         <li class="editor-drop-update"><a href="javascript:void(0);">UPDATE <span class="editor-drop-identifier"></span>...</a></li>
-        <li class="editor-drop-delete"><a href="javascript:void(0);">DELETE FROM <span class="editor-drop-identifier"></span>...</a></li>
+        <li class="editor-drop-drop"><a href="javascript:void(0);">DROP TABLE <span class="editor-drop-identifier"></span>...</a></li>
       </ul>
     </div>
     <div class="clearfix"></div>