Mercurial > sqlpython
changeset 471:dfe5a19e7390
merged tag 1.7.1
author | catherine@Drou |
---|---|
date | Wed, 03 Mar 2010 13:25:43 -0500 |
parents | d0164c122938 (diff) a40993ec8995 (current diff) |
children | 9f58d8f807d3 |
files | |
diffstat | 2 files changed, 4 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/setup.py Wed Mar 03 13:24:06 2010 -0500 +++ b/setup.py Wed Mar 03 13:25:43 2010 -0500 @@ -9,7 +9,7 @@ Operating System :: OS Independent""".splitlines() setup(name="sqlpython", - version="1.7.0", + version="1.7.1", description="Command-line interface to Oracle", long_description="Customizable alternative to Oracle's SQL*PLUS command-line interface", author="Luca Canali", @@ -17,7 +17,7 @@ url="http://packages.python.org/sqlpython", packages=find_packages(), include_package_data=True, - install_requires=['pyparsing','cmd2>=0.6.0','gerald>=0.3.6', + install_requires=['pyparsing','cmd2>=0.6.1','gerald>=0.3.6', 'genshi>=0.5'], extras_require = { 'oracle': ['cx_Oracle>=5.0.2'],
--- a/sqlpython/sqlpyPlus.py Wed Mar 03 13:24:06 2010 -0500 +++ b/sqlpython/sqlpyPlus.py Wed Mar 03 13:25:43 2010 -0500 @@ -360,7 +360,6 @@ # TODO: read comments in psql # ls -l -# bind variables / quotes class sqlpyPlus(sqlpython.sqlpython): defaultExtension = 'sql' @@ -450,7 +449,7 @@ def dbms_output(self): "Dumps contents of Oracle's DBMS_OUTPUT buffer (where PUT_LINE goes)" try: - line = self.curs.var(cx_Oracle.STRING) # TODO: would regular string and number work? + line = self.curs.var(cx_Oracle.STRING) status = self.curs.var(cx_Oracle.NUMBER) self.curs.callproc('dbms_output.get_line', [line, status]) while not status.getvalue(): @@ -1387,7 +1386,7 @@ #arg = self.parsed(arg) if hasattr(arg, 'parsed'): arg = arg.parsed.raw - arg = arg.strip(self.terminators) + arg = arg.strip('\n;').lstrip(':') try: var, val = self.assignmentSplitter.split(arg, maxsplit=1) except ValueError: