Skip to content

Commit

Permalink
Revert "adding oracle param support related to #137 (#149)" (#150)
Browse files Browse the repository at this point in the history
This reverts commit 5d1a81e.
  • Loading branch information
t8y8 committed Apr 30, 2018
1 parent 5d1a81e commit c1f07e7
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 52 deletions.
46 changes: 1 addition & 45 deletions tableaudocumentapi/connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ def __init__(self, connxml):
self._server = connxml.get('server')
self._username = connxml.get('username')
self._authentication = connxml.get('authentication')
self._schema = connxml.get('schema')
self._service = connxml.get('service')
self._class = connxml.get('class')
self._port = connxml.get('port', None)
self._query_band = connxml.get('query-band-spec', None)
Expand All @@ -28,7 +26,7 @@ def __repr__(self):

@classmethod
def from_attributes(cls, server, dbname, username, dbclass, port=None, query_band=None,
initial_sql=None, authentication='', schema='', service=''):
initial_sql=None, authentication=''):
"""Creates a new connection that can be added into a Data Source.
defaults to `''` which will be treated as 'prompt' by Tableau."""

Expand All @@ -37,8 +35,6 @@ def from_attributes(cls, server, dbname, username, dbclass, port=None, query_ban
xml.server = server
xml.dbname = dbname
xml.username = username
xml.schema = schema
xml.service = service
xml.dbclass = dbclass
xml.port = port
xml.query_band = query_band
Expand Down Expand Up @@ -210,43 +206,3 @@ def initial_sql(self, value):
pass
else:
self._connectionXML.set('one-time-sql', value)

@property
def schema(self):
"""Database schema for the connection. Not the table name."""
return self._schema

@schema.setter
def schema(self, value):
"""
Set the connection's schema property.
Args:
value: New name of the database schema. String.
Returns:
Nothing.
"""
self._schema = value
self._connectionXML.set('schema', value)

@property
def service(self):
"""Database service for the connection. Not the table name."""
return self._service

@service.setter
def service(self, value):
"""
Set the connection's service property.
Args:
value: New name of the database service. String.
Returns:
Nothing.
"""
self._service = value
self._connectionXML.set('service', value)
7 changes: 0 additions & 7 deletions test/bvt.py
Original file line number Diff line number Diff line change
Expand Up @@ -112,13 +112,6 @@ def test_can_create_connection_from_scratch(self):
self.assertEqual(conn.dbclass, 'mysql')
self.assertEqual(conn.authentication, 'd')

def test_can_create_oracle_connection_from_scratch(self):
conn = Connection.from_attributes(
server='a', dbname='b', username='c', dbclass='oracle', schema='d', service='e')
self.assertEqual(conn.server, 'a')
self.assertEqual(conn.schema, 'd')
self.assertEqual(conn.service, 'e')

def test_can_create_datasource_from_connections(self):
conn1 = Connection.from_attributes(
server='a', dbname='b', username='c', dbclass='mysql', authentication='d')
Expand Down

0 comments on commit c1f07e7

Please sign in to comment.