Update to my2pg 1.24.

This commit is contained in:
Bruce Momjian 2002-04-24 01:42:29 +00:00
parent 42f2e5bd11
commit 450e728d24
1 changed files with 28 additions and 7 deletions

View File

@ -35,8 +35,8 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
# $My2pg: my2pg.pl,v 1.23 2001/12/06 19:32:20 fonin Exp $
# $Id: my2pg.pl,v 1.7 2002/02/08 14:47:56 momjian Exp $
# $My2pg: my2pg.pl,v 1.24 2001/12/06 19:32:20 fonin Exp $
# $Id: my2pg.pl,v 1.8 2002/04/24 01:42:29 momjian Exp $
# TODO:
# + Handle SETs
@ -47,8 +47,28 @@
#
# $Log: my2pg.pl,v $
# Revision 1.7 2002/02/08 14:47:56 momjian
# Upgrade my2pg version 1.23.
# Revision 1.8 2002/04/24 01:42:29 momjian
# Update to my2pg 1.24.
#
# Revision 1.24 2002/04/20 14:15:43 fonin
# Patch by Felipe Nievinski <fnievinski@terra.com.br>.
# A table I was re-creating had a composite primary key, and I was using
# the -d switch to maintain the table and column names
# adding double quotes around them.
#
# The SQL code generated was something like this:
#
# CREATE TABLE "rinav" (
# "UnidadeAtendimento" INT8 DEFAULT '0' NOT NULL,
# "NumeroRinav" INT8 DEFAULT '0' NOT NULL,
# -- ...
# PRIMARY KEY ("UnidadeAtendimento"," NumeroRinav")
# );
#
# Please note the space inside the second column name string in the PK
# definition. Because of this PostgreSQL was not able to create the table.
#
# FIXED.
#
# Revision 1.23 2002/02/07 22:13:52 fonin
# Bugfix by Hans-Juergen Schoenig <hs@cybertec.at>: additional space after
@ -151,7 +171,7 @@ if($opts{d} ne '') {
$|=1;
print("------------------------------------------------------------------");
print("\n-- My2Pg 1.23 translated dump");
print("\n-- My2Pg 1.24 translated dump");
print("\n--");
print("\n------------------------------------------------------------------");
@ -173,7 +193,7 @@ $libtypename.='/libtypes.so';
# push header to libtypes.c
open(LIBTYPES,">$libtypesource");
print LIBTYPES "/******************************************************";
print LIBTYPES "\n * My2Pg \$Revision: 1.7 $ \translated dump";
print LIBTYPES "\n * My2Pg \$Revision: 1.8 $ \translated dump";
print LIBTYPES "\n * User types definitions";
print LIBTYPES "\n ******************************************************/";
print LIBTYPES "\n\n#include <postgres.h>\n";
@ -628,6 +648,7 @@ CREATE OPERATOR <> (
if(/PRIMARY KEY \((.*)\)/i) {
my $tmpfld=$1;
$tmpfld=~s/,/","/g if $dq;
$tmpfld=~s/ //g;
s/PRIMARY KEY (\(.*\))/PRIMARY KEY \($dq$tmpfld$dq\)/i;
s/(PRIMARY KEY \(.*\)).*/$1$check\n/i;
}
@ -704,7 +725,7 @@ close(LIBTYPES);
open(MAKE,">Makefile");
print MAKE "#
# My2Pg \$Revision: 1.7 $ \translated dump
# My2Pg \$Revision: 1.8 $ \translated dump
# Makefile
#