Revert "postgres_binary_mode".

PiotrSikora · PiotrSikora · commit 2893476e1768 · 2010-12-23T00:12:41.000Z
This is great feature, but the way it hooks into configuration must be rewritten (as discussed with Yichun on the IRC). This reverts commit 4187c57.
diff --git a/README.md b/README.md
@@ -46,7 +46,7 @@ postgres_pass
 -------------
 * **syntax**: `postgres_pass upstream`
 * **default**: `none`
-* **context**: `location`, `if location`
+* **context**: `location`
 
 Set name of an upstream block that will be used for the database connections
 (it can include variables).
@@ -56,31 +56,19 @@ postgres_query
 --------------
 * **syntax**: `postgres_query [methods] query`
 * **default**: `none`
-* **context**: `http`, `server`, `location`, `if location`
+* **context**: `http`, `server`, `location`
 
 Set query string (it can include variables). When methods are specified then
 query is used only for them, otherwise it's used for all methods.
 
 This directive can be used more than once within same context.
 
 
-postgres_binary_mode
------------------------
-* **syntax**: `postgres_binary_mode on|off`
-* **default**: `off`
-* **context**: `http`, `server`, `location`, `if location`
-
-Controls whether to use the binary mode for `all` the data fields
-in the result set on the PostgreSQL side. The big-endian format is usually followed,
-which is controled by PostgreSQL.
-
-Default off.
-
 postgres_rewrite
 ----------------
 * **syntax**: `postgres_rewrite [methods] condition [=]status_code`
 * **default**: `none`
-* **context**: `http`, `server`, `location`, `location if`
+* **context**: `http`, `server`, `location`
 
 Rewrite response `status_code` when given condition is met (first one wins!):
 
@@ -102,7 +90,7 @@ postgres_output
 ---------------
 * **syntax**: `postgres_output none|value|row|rds [row] [column]`
 * **default**: `rds`
-* **context**: `http`, `server`, `location`, `location if`
+* **context**: `http`, `server`, `location`
 
 Set output format:
 
diff --git a/src/ngx_postgres_module.c b/src/ngx_postgres_module.c
@@ -117,14 +117,6 @@ static ngx_command_t ngx_postgres_module_commands[] = {
       offsetof(ngx_postgres_loc_conf_t, upstream.read_timeout),
       NULL },
 
-    { ngx_string("postgres_binary_mode"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|
-          NGX_HTTP_LIF_CONF|NGX_CONF_FLAG,
-      ngx_conf_set_flag_slot,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(ngx_postgres_loc_conf_t, binary_mode),
-      NULL },
-
       ngx_null_command
 };
 
@@ -317,7 +309,6 @@ ngx_postgres_create_loc_conf(ngx_conf_t *cf)
      *     conf->query.methods = NULL
      *     conf->query.def = NULL
      *     conf->output_value = NULL
-     *     conf->binary_mode = 0
      */
 
     conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC;
@@ -326,7 +317,6 @@ ngx_postgres_create_loc_conf(ngx_conf_t *cf)
     conf->rewrites = NGX_CONF_UNSET_PTR;
     conf->output_handler = NGX_CONF_UNSET_PTR;
     conf->variables = NGX_CONF_UNSET_PTR;
-    conf->binary_mode = NGX_CONF_UNSET;
 
     /* the hardcoded values */
     conf->upstream.cyclic_temp_file = 0;
@@ -387,8 +377,6 @@ ngx_postgres_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
 
     ngx_conf_merge_ptr_value(conf->variables, prev->variables, NULL);
 
-    ngx_conf_merge_value(conf->binary_mode, prev->binary_mode, 0);
-
     dd("returning NGX_CONF_OK");
     return NGX_CONF_OK;
 }
diff --git a/src/ngx_postgres_module.h b/src/ngx_postgres_module.h
@@ -155,9 +155,6 @@ typedef struct {
     ngx_postgres_value_t               *output_value;
     /* custom variables */
     ngx_array_t                        *variables;
-
-    /* data field format */
-    ngx_flag_t                          binary_mode;
 } ngx_postgres_loc_conf_t;
 
 typedef struct {
diff --git a/src/ngx_postgres_processor.c b/src/ngx_postgres_processor.c
@@ -219,14 +219,7 @@ ngx_postgres_upstream_send_query(ngx_http_request_t *r, ngx_connection_t *pgxc,
 
     dd("sending query: %s", query);
 
-    if (pgdt->loc_conf->binary_mode) {
-        pgrc = PQsendQueryParams(pgdt->pgconn, (const char *) query, 0,
-                NULL, NULL, NULL, NULL, /* binary */ 1);
-
-    } else {
-        pgrc = PQsendQuery(pgdt->pgconn, (const char *) query);
-    }
-
+    pgrc = PQsendQuery(pgdt->pgconn, (const char *) query);
     if (pgrc == 0) {
         dd("sending query failed");
         ngx_log_error(NGX_LOG_ERR, pgxc->log, 0,
diff --git a/t/loc-if.t b/t/loc-if.t
@@ -80,7 +80,7 @@ Content-Type: application/x-resty-dbd-stream
 
 
 
-=== TEST 2: postgres_pass and postgres_query work in location if blocks
+=== TEST 1: postgres_pass and postgres_query work in location if blocks
 --- http_config
     upstream database {
         postgres_server     127.0.0.1:$TEST_NGINX_POSTGRESQL_PORT dbname=ngx_test
