From 698551bb90997590052890a2a1b510522ecc602b Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Thu, 5 Aug 2004 20:00:24 +0000 Subject: [PATCH] Another schema support bug from Mark git-svn-id: http://svn.osgeo.org/postgis/trunk@665 b70326c6-7e19-0410-871a-916f4a2858ee --- loader/shp2pgsql.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/loader/shp2pgsql.c b/loader/shp2pgsql.c index 42b1baca9..498ed3c09 100644 --- a/loader/shp2pgsql.c +++ b/loader/shp2pgsql.c @@ -12,6 +12,9 @@ * ********************************************************************** * $Log$ + * Revision 1.62 2004/08/05 20:00:24 strk + * Another schema support bug from Mark + * * Revision 1.61 2004/08/05 16:53:29 strk * schema support patches sent by Mark * @@ -1166,10 +1169,22 @@ int main (int ARGC, char **ARGV){ free(col_names); - if(opt != 'a'){ - printf("\nALTER TABLE ONLY \"%s\" ADD CONSTRAINT \"%s_pkey\" PRIMARY KEY (gid);\n",table,table); - if(j > 1){ - printf("SELECT setval ('\"%s_gid_seq\"', %i, true);\n", table, j-1); + if(opt != 'a') + { + if ( schema ) + { + printf("\nALTER TABLE ONLY \"%s\".\"%s\" ADD CONSTRAINT \"%s_pkey\" PRIMARY KEY (gid);\n",schema,table,table); + if(j > 1) + { + printf("SELECT setval ('\"%s\".\"%s_gid_seq\"', %i, true);\n", schema, table, j-1); + } + } + else + { + printf("\nALTER TABLE ONLY \"%s\" ADD CONSTRAINT \"%s_pkey\" PRIMARY KEY (gid);\n",table,table); + if(j > 1){ + printf("SELECT setval ('\"%s_gid_seq\"', %i, true);\n", table, j-1); + } } } -- 2.40.0