aboutsummaryrefslogtreecommitdiff
path: root/src/backend/commands/view.c
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2000-09-12 04:15:58 +0000
committerBruce Momjian <bruce@momjian.us>2000-09-12 04:15:58 +0000
commit0ba0e321726e02c54c4440282b51f25078fe8d81 (patch)
tree43e9199812be014d8e3a03f84612e0a2e1762bf6 /src/backend/commands/view.c
parentb1777d5f997a4e1c5989c2c7d3be5df447a41614 (diff)
downloadpostgresql-0ba0e321726e02c54c4440282b51f25078fe8d81.tar.gz
postgresql-0ba0e321726e02c54c4440282b51f25078fe8d81.zip
O.K. -
Here's the multibyte aware version of my patch to fix the truncation of the rulename autogenerated during a CREATE VIEW. I've modified all the places in the backend that want to construct the rulename to use the MakeRetrieveViewRuleName(), where I put the #ifdef MULTIBYTE, so that's the only place that knows how to construct a view rulename. Except pg_dump, where I replicated the code, since it's a standalone binary. The only effect the enduser will see is that views with names len(name) > NAMEDATALEN-4 will fail to be created, if the derived rulename clases with an existing rule: i.e. the user is trying to create two views with long names whose first difference is past NAMEDATALEN-4 (but before NAMEDATALEN: that'll error out after the viewname truncation.) In no case will the user get left with a table without a view rule, as the current code does. Ross Reedstrom
Diffstat (limited to 'src/backend/commands/view.c')
-rw-r--r--src/backend/commands/view.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/backend/commands/view.c b/src/backend/commands/view.c
index 8503eb3a7eb..01e23d13150 100644
--- a/src/backend/commands/view.c
+++ b/src/backend/commands/view.c
@@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Id: view.c,v 1.45 2000/07/04 06:11:30 tgl Exp $
+ * $Id: view.c,v 1.46 2000/09/12 04:15:56 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -120,6 +120,14 @@ MakeRetrieveViewRuleName(char *viewName)
buf = palloc(strlen(viewName) + 5);
snprintf(buf, strlen(viewName) + 5, "_RET%s", viewName);
+#ifdef MULTIBYTE
+ int len;
+ len = pg_mbcliplen(buf,strlen(buf),NAMEDATALEN-1);
+ buf[len] = '\0';
+#else
+ buf[NAMEDATALEN-1] = '\0';
+#endif
+
return buf;
}