Преглед изворни кода

HUE-8580 [importer] Fix RDBMS support for scoop configured import.

jdesjean пре 7 година
родитељ
комит
522bf8c35d

+ 5 - 1
desktop/libs/indexer/src/indexer/indexers/rdbms.py

@@ -86,7 +86,11 @@ def _get_api(request):
       }
       name = 'rdbms:%(server_name)s://%(server_host)s:%(server_port)s' % query_server # We make sure it's unique as name is the cache key
   else:
-    type = file_format['rdbmsJdbcDriverName'] and file_format['rdbmsJdbcDriverName'].lower()
+    if file_format['rdbmsType'] == 'jdbc':
+      type = file_format['rdbmsJdbcDriverName'] and file_format['rdbmsJdbcDriverName'].lower()
+    else:
+      type = file_format['rdbmsType']
+      query_server = rdbms.get_query_server_config(server=file_format['rdbmsType'])
     name = type
     interface = file_format['inputFormat']
 

+ 4 - 0
desktop/libs/indexer/src/indexer/templates/importer.mako

@@ -1663,6 +1663,8 @@ ${ assist.assistPanel() }
       self.rdbmsType = ko.observable(null);
       self.rdbmsType.subscribe(function (val) {
         self.path('');
+        self.rdbmsDatabaseNames([]);
+        self.rdbmsDatabaseName('');
         resizeElements();
         if(self.rdbmsMode() === 'configRdbms' && val !== 'jdbc') {
           self.isFetchingDatabaseNames(true);
@@ -1712,6 +1714,7 @@ ${ assist.assistPanel() }
       self.rdbmsJdbcDriverName = ko.observable();
       self.rdbmsJdbcDriverName.subscribe(function () {
         self.rdbmsDatabaseNames([]);
+        self.rdbmsDatabaseName('');
         self.isFetchingDatabaseNames(true);
         $.post("${ url('indexer:get_db_component') }", {
           "source": ko.mapping.toJSON(self)
@@ -1775,6 +1778,7 @@ ${ assist.assistPanel() }
       self.rdbmsDbIsValid = ko.observable(false);
       self.rdbmsCheckConnection = function() {
         self.isFetchingDatabaseNames(true);
+        self.rdbmsDatabaseNames([]);
         self.rdbmsDatabaseName(''); // Need to clear or else get_db_component will return list of tables
         $.post("${ url('indexer:get_db_component') }", {
           "source": ko.mapping.toJSON(self)