summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDaniele Varrazzo <daniele.varrazzo@gmail.com>2016-08-07 01:53:21 +0100
committerDaniele Varrazzo <daniele.varrazzo@gmail.com>2016-08-07 01:53:21 +0100
commit2a4d6027a4e5732af1cdc41969c5cab3bb30430b (patch)
tree4f0ae8858ddaed8e23b3a803e4033fa77b7524f0 /lib
parentd5443c65fde6cae87a1dcd901f31b6cdca7a1811 (diff)
parent90ee1ebba5d1da4bd9d8c6e12944308074732f08 (diff)
downloadpsycopg2-2a4d6027a4e5732af1cdc41969c5cab3bb30430b.tar.gz
Merge branch 'master' into replication-protocol
Conflicts: tests/testconfig.py
Diffstat (limited to 'lib')
-rw-r--r--lib/errorcodes.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/errorcodes.py b/lib/errorcodes.py
index aa5a723..60181c1 100644
--- a/lib/errorcodes.py
+++ b/lib/errorcodes.py
@@ -199,6 +199,8 @@ INVALID_ESCAPE_SEQUENCE = '22025'
STRING_DATA_LENGTH_MISMATCH = '22026'
TRIM_ERROR = '22027'
ARRAY_SUBSCRIPT_ERROR = '2202E'
+INVALID_TABLESAMPLE_REPEAT = '2202G'
+INVALID_TABLESAMPLE_ARGUMENT = '2202H'
FLOATING_POINT_EXCEPTION = '22P01'
INVALID_TEXT_REPRESENTATION = '22P02'
INVALID_BINARY_REPRESENTATION = '22P03'
@@ -271,6 +273,7 @@ INVALID_SQLSTATE_RETURNED = '39001'
NULL_VALUE_NOT_ALLOWED = '39004'
TRIGGER_PROTOCOL_VIOLATED = '39P01'
SRF_PROTOCOL_VIOLATED = '39P02'
+EVENT_TRIGGER_PROTOCOL_VIOLATED = '39P03'
# Class 3B - Savepoint Exception
SAVEPOINT_EXCEPTION = '3B000'
@@ -408,6 +411,7 @@ PLPGSQL_ERROR = 'P0000'
RAISE_EXCEPTION = 'P0001'
NO_DATA_FOUND = 'P0002'
TOO_MANY_ROWS = 'P0003'
+ASSERT_FAILURE = 'P0004'
# Class XX - Internal Error
INTERNAL_ERROR = 'XX000'