adamv avatar adamv committed 87420b2

Added "DATABASE_USE_MARS" and "DATABASE_EXTRA" settings.

Comments (0)

Files changed (1)

source/sqlserver_ado/base.py

         auth_string = "UID=%s;PWD=%s" % (settings.DATABASE_USER, settings.DATABASE_PASSWORD)
     else:
         auth_string = "Integrated Security=SSPI"
+    
+    extra = ''
+    
+    if hasattr(settings, 'DATABASE_USE_MARS') and settings.DATABASE_USE_MARS:
+        extra += ";MultipleActiveResultSets=true"
+    
+    if hasattr(settings, 'DATABASE_EXTRA'):
+        extra += ";"+settings.DATABASE_EXTRA
 
-    return "PROVIDER=SQLOLEDB;DATA SOURCE=%s;Initial Catalog=%s;%s" % (datasource, settings.DATABASE_NAME, auth_string)
+    return "PROVIDER=SQLOLEDB;DATA SOURCE=%s;Initial Catalog=%s;%s%s" %\
+        (datasource, settings.DATABASE_NAME, auth_string, extra)
 
 class DatabaseWrapper(BaseDatabaseWrapper):
     operators = {
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.