Method set_transaction() renamed to set_session()

In fact it doesn't change "the transaction", as there has to be no
transaction when invoked. The effect instead is to execute SET SESSION
CHARACTERISTICS.

3 files changed, 15 insertions, 15 deletions

diff --git a/psycopg/connection.h b/psycopg/connection.h
index 14d58a0..7f512a1 100644
--- a/psycopg/connection.h
+++ b/psycopg/connection.h
@@ -136,7 +136,7 @@ HIDDEN int  conn_connect(connectionObject *self, long int async);
 HIDDEN void conn_close(connectionObject *self);
 HIDDEN int  conn_commit(connectionObject *self);
 HIDDEN int  conn_rollback(connectionObject *self);
-HIDDEN int  conn_set_transaction(connectionObject *self, const char *isolevel,
+HIDDEN int  conn_set_session(connectionObject *self, const char *isolevel,
                                  const char *readonly, const char *deferrable,
                                  int autocommit);
 HIDDEN int  conn_set_autocommit(connectionObject *self, int value);
diff --git a/psycopg/connection_int.c b/psycopg/connection_int.c
index 732b22e..441d362 100644
--- a/psycopg/connection_int.c
+++ b/psycopg/connection_int.c
@@ -959,7 +959,7 @@ conn_rollback(connectionObject *self)
 }
 
 int
-conn_set_transaction(connectionObject *self,
+conn_set_session(connectionObject *self,
         const char *isolevel, const char *readonly, const char *deferrable,
         int autocommit)
 {
@@ -971,7 +971,7 @@ conn_set_transaction(connectionObject *self,
     pthread_mutex_lock(&self->lock);
 
     if (isolevel) {
-        Dprintf("conn_set_transaction: setting isolation to %s", isolevel);
+        Dprintf("conn_set_session: setting isolation to %s", isolevel);
         if ((res = pq_set_guc_locked(self,
                 "default_transaction_isolation", isolevel,
                 &pgres, &error, &_save))) {
@@ -980,7 +980,7 @@ conn_set_transaction(connectionObject *self,
     }
 
     if (readonly) {
-        Dprintf("conn_set_transaction: setting read only to %s", readonly);
+        Dprintf("conn_set_session: setting read only to %s", readonly);
         if ((res = pq_set_guc_locked(self,
                 "default_transaction_read_only", readonly,
                 &pgres, &error, &_save))) {
@@ -989,7 +989,7 @@ conn_set_transaction(connectionObject *self,
     }
 
     if (deferrable) {
-        Dprintf("conn_set_transaction: setting deferrable to %s", deferrable);
+        Dprintf("conn_set_session: setting deferrable to %s", deferrable);
         if ((res = pq_set_guc_locked(self,
                 "default_transaction_deferrable", deferrable,
                 &pgres, &error, &_save))) {
@@ -998,7 +998,7 @@ conn_set_transaction(connectionObject *self,
     }
 
     if (self->autocommit != autocommit) {
-        Dprintf("conn_set_transaction: setting autocommit to %d", autocommit);
+        Dprintf("conn_set_session: setting autocommit to %d", autocommit);
         self->autocommit = autocommit;
     }
 
diff --git a/psycopg/connection_type.c b/psycopg/connection_type.c
index 13c017e..e456ce4 100644
--- a/psycopg/connection_type.c
+++ b/psycopg/connection_type.c
@@ -456,14 +456,14 @@ _psyco_conn_parse_onoff(PyObject *pyval)
     }
 }
 
-/* set_transaction - default transaction characteristics */
+/* set_session - set default transaction characteristics */
 
-#define psyco_conn_set_transaction_doc \
-"set_transaction(...) -- Set one or more parameters for the next transactions.\n\n" \
+#define psyco_conn_set_session_doc \
+"set_session(...) -- Set one or more parameters for the next transactions.\n\n" \
 "Accepted arguments are 'isolation_level', 'readonly', 'deferrable', 'autocommit'."
 
 static PyObject *
-psyco_conn_set_transaction(connectionObject *self, PyObject *args, PyObject *kwargs)
+psyco_conn_set_session(connectionObject *self, PyObject *args, PyObject *kwargs)
 {
     PyObject *isolevel = Py_None;
     PyObject *readonly = Py_None;
@@ -479,8 +479,8 @@ psyco_conn_set_transaction(connectionObject *self, PyObject *args, PyObject *kwa
         {"isolation_level", "readonly", "deferrable", "autocommit", NULL};
 
     EXC_IF_CONN_CLOSED(self);
-    EXC_IF_CONN_ASYNC(self, set_transaction);
-    EXC_IF_IN_TRANSACTION(self, set_transaction);
+    EXC_IF_CONN_ASYNC(self, set_session);
+    EXC_IF_IN_TRANSACTION(self, set_session);
 
     if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|OOOO", kwlist,
             &isolevel, &readonly, &deferrable, &autocommit)) {
@@ -514,7 +514,7 @@ psyco_conn_set_transaction(connectionObject *self, PyObject *args, PyObject *kwa
         if (-1 == c_autocommit) { return NULL; }
     }
 
-    if (0 != conn_set_transaction(self,
+    if (0 != conn_set_session(self,
             c_isolevel, c_readonly, c_deferrable, c_autocommit)) {
         return NULL;
     }
@@ -904,8 +904,8 @@ static struct PyMethodDef connectionObject_methods[] = {
     {"tpc_recover", (PyCFunction)psyco_conn_tpc_recover,
      METH_NOARGS, psyco_conn_tpc_recover_doc},
 #ifdef PSYCOPG_EXTENSIONS
-    {"set_transaction", (PyCFunction)psyco_conn_set_transaction,
-     METH_VARARGS|METH_KEYWORDS, psyco_conn_set_transaction_doc},
+    {"set_session", (PyCFunction)psyco_conn_set_session,
+     METH_VARARGS|METH_KEYWORDS, psyco_conn_set_session_doc},
     {"set_isolation_level", (PyCFunction)psyco_conn_set_isolation_level,
      METH_VARARGS, psyco_conn_set_isolation_level_doc},
     {"set_client_encoding", (PyCFunction)psyco_conn_set_client_encoding,