Răsfoiți Sursa

HUE-5742 [core] Allow user to provide schema name for database via ini

krish 8 ani în urmă
părinte
comite
d717ee8

+ 2 - 0
desktop/conf.dist/hue.ini

@@ -527,6 +527,8 @@
     ## password_script=/path/script
     ## name=desktop/desktop.db
     ## options={}
+    # Database schema, to be used only when public schema is revoked in postgres
+    ## schema=
 
   # Configuration options for specifying the Desktop session.
   # For more info, see https://docs.djangoproject.com/en/1.4/topics/http/sessions/

+ 2 - 0
desktop/conf/pseudo-distributed.ini.tmpl

@@ -1411,6 +1411,8 @@
       # https://docs.djangoproject.com/en/1.4/ref/databases/
       ## options={}
 
+      # Database schema, to be used only when public schema is revoked in postgres
+      ## schema=
 
 ###########################################################################
 # Settings to configure SAML

+ 6 - 0
desktop/core/src/desktop/conf.py

@@ -563,6 +563,12 @@ DATABASE = ConfigSection(
       type=str,
       default='',
     ),
+    SCHEMA=Config(
+      key='schema',
+      help=_('Database schema, to be used only when public schema is revoked in postgres.'),
+      type=str,
+      default='',
+    ),
     PASSWORD=Config(
       key='password',
       help=_('Database password.'),

+ 1 - 0
desktop/core/src/desktop/settings.py

@@ -320,6 +320,7 @@ else:
     "ENGINE" : desktop.conf.DATABASE.ENGINE.get(),
     "NAME" : desktop.conf.DATABASE.NAME.get(),
     "USER" : desktop.conf.DATABASE.USER.get(),
+    "SCHEMA" : desktop.conf.DATABASE.SCHEMA.get(),
     "PASSWORD" : desktop.conf.get_database_password(),
     "HOST" : desktop.conf.DATABASE.HOST.get(),
     "PORT" : str(desktop.conf.DATABASE.PORT.get()),