|
From: Oleg B. <no...@so...> - 2017-10-31 19:15:20
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".
The branch, master has been updated
via 0a6f19d2d975fc5ac7a5d25259add57bee7f6cfe (commit)
via 6b80a2d7bc86f07314fbe666abbed49b777056e2 (commit)
via e624f5bea851154b7c76ff004dd961506e0d3efd (commit)
via e4c5c2867187f6ab729b3f4fb503424e578a7f89 (commit)
from c230e9e8959da4447a578b6cfdb427eb17d43b5f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceforge.net/p/sqlobject/sqlobject/ci/0a6f19d2d975fc5ac7a5d25259add57bee7f6cfe
commit 0a6f19d2d975fc5ac7a5d25259add57bee7f6cfe
Author: Oleg Broytman <ph...@ph...>
Date: Tue Oct 31 20:48:40 2017 +0300
Docs: Update news
diff --git a/docs/News.rst b/docs/News.rst
index 51ad44e..8bc7582 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -22,7 +22,7 @@ Documentation
-------------
* Remove generated HTML from eggs/wheels (docs are installed into wrong
- place). Generated docs are still included in source distribution.
+ place). Generated docs are still included in the source distribution.
Tests
-----
@@ -30,7 +30,7 @@ Tests
* Add tests for PyGreSQL, py-postgresql and pg8000 at AppVeyor.
* Fixed bugs in py-postgresql at AppVeyor. SQLObject requires
- the latest version of the driver from git.
+ the latest version of the driver from our fork.
SQLObject 3.4.0
===============
http://sourceforge.net/p/sqlobject/sqlobject/ci/6b80a2d7bc86f07314fbe666abbed49b777056e2
commit 6b80a2d7bc86f07314fbe666abbed49b777056e2
Author: Oleg Broytman <ph...@ph...>
Date: Tue Oct 31 20:32:50 2017 +0300
Tests(AppVeyor): Stop all MS SQL tests: too many timeouts
diff --git a/appveyor.yml b/appveyor.yml
index 12ae77d..a18c941 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -33,16 +33,6 @@ environment:
CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\run_with_env.cmd"
matrix:
- - TOX_ENV: "py27-mssql-pyodbc-w32"
- PYTHON_ARCH: "32"
- PYTHON_VERSION: "2.7"
- PYTHON_HOME: "C:\\Python27"
- db: mssql2014
- - TOX_ENV: "py34-mssql-pyodbc-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "3.4"
- PYTHON_HOME: "C:\\Python34-x64"
- db: mssql2014
- TOX_ENV: "py27-mysql-connector-w32"
PYTHON_ARCH: "32"
PYTHON_VERSION: "2.7"
@@ -273,21 +263,6 @@ install:
# List ODBC drivers
- ps: Get-OdbcDriver -Platform 32-bit | Select-Object -ExpandProperty Name
- ps: Get-OdbcDriver -Platform 64-bit | Select-Object -ExpandProperty Name
- # Enable TCP for mssql
- - ps: |
- [reflection.assembly]::LoadWithPartialName("Microsoft.SqlServer.Smo") | Out-Null
- [reflection.assembly]::LoadWithPartialName("Microsoft.SqlServer.SqlWmiManagement") | Out-Null
- $serverName = $env:COMPUTERNAME
- $instanceName = 'SQL2014'
- $smo = 'Microsoft.SqlServer.Management.Smo.'
- $wmi = new-object ($smo + 'Wmi.ManagedComputer')
- $uri = "ManagedComputer[@Name='$serverName']/ServerInstance[@Name='$instanceName']/ServerProtocol[@Name='Tcp']"
- $Tcp = $wmi.GetSmoObject($uri)
- $Tcp.IsEnabled = $true
- $TCP.alter()
- Set-Service SQLBrowser -StartupType Manual
- Start-Service SQLBrowser
- Start-Service "MSSQL`$$instanceName"
# Not a C project, so no build step
build: false
http://sourceforge.net/p/sqlobject/sqlobject/ci/e624f5bea851154b7c76ff004dd961506e0d3efd
commit e624f5bea851154b7c76ff004dd961506e0d3efd
Author: Oleg Broytman <ph...@ph...>
Date: Tue Oct 31 20:30:42 2017 +0300
Fix(pg800): Recognize ('ERROR', 'ERROR', '23505') as DuplicateEntryError
diff --git a/sqlobject/postgres/pgconnection.py b/sqlobject/postgres/pgconnection.py
index c48e43f..a306866 100644
--- a/sqlobject/postgres/pgconnection.py
+++ b/sqlobject/postgres/pgconnection.py
@@ -256,7 +256,10 @@ class PostgresConnection(DBAPI):
raise dberrors.InternalError(ErrorMessage(e))
except self.module.ProgrammingError as e:
msg = ErrorMessage(e)
- if (len(e.args) >= 2) and e.args[1] == '23505':
+ if (
+ (len(e.args) > 2) and (e.args[1] == 'ERROR') and
+ (e.args[2] == '23505')) \
+ or ((len(e.args) >= 2) and (e.args[1] == '23505')):
raise dberrors.DuplicateEntryError(msg)
else:
raise dberrors.ProgrammingError(msg)
http://sourceforge.net/p/sqlobject/sqlobject/ci/e4c5c2867187f6ab729b3f4fb503424e578a7f89
commit e4c5c2867187f6ab729b3f4fb503424e578a7f89
Author: Oleg Broytman <ph...@ph...>
Date: Tue Oct 31 20:23:19 2017 +0300
Fix(pg800): Fix encoding problem under Python 2.7
diff --git a/.travis.yml b/.travis.yml
index 60548f8..be4d42e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -120,7 +120,6 @@ matrix:
env: TOXENV=py36-firebirdsql
allow_failures:
- - env: TOXENV=py27-postgres-pg8000
- env: TOXENV=py27-firebird-fdb
- env: TOXENV=py34-firebird-fdb
- env: TOXENV=py35-firebird-fdb
diff --git a/docs/News.rst b/docs/News.rst
index b925c44..51ad44e 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -14,8 +14,7 @@ Drivers
-------
* Add support for `pg8000 <https://pypi.python.org/pypi/pg8000>`_
- PostgreSQL driver (from our fork). There is a minor problem
- with Python 2.7.
+ PostgreSQL driver (from our fork).
* Fix autoreconnect with pymysql driver. Contributed by Shailesh Mungikar.
diff --git a/sqlobject/postgres/pgconnection.py b/sqlobject/postgres/pgconnection.py
index f17b7e0..c48e43f 100644
--- a/sqlobject/postgres/pgconnection.py
+++ b/sqlobject/postgres/pgconnection.py
@@ -235,6 +235,10 @@ class PostgresConnection(DBAPI):
def _executeRetry(self, conn, cursor, query):
if self.debug:
self.printDebug(conn, query, 'QueryR')
+ dbEncoding = self.dbEncoding
+ if dbEncoding and isinstance(query, bytes) and (
+ self.driver == 'pg8000'):
+ query = query.decode(dbEncoding)
try:
return cursor.execute(query)
except self.module.OperationalError as e:
-----------------------------------------------------------------------
Summary of changes:
.travis.yml | 1 -
appveyor.yml | 25 -------------------------
docs/News.rst | 7 +++----
sqlobject/postgres/pgconnection.py | 9 ++++++++-
4 files changed, 11 insertions(+), 31 deletions(-)
hooks/post-receive
--
SQLObject development repository
|
