- Refactored an oid2name script and renamed (generated) data files.

Author: snaga

Makefile

@@ -21,9 +21,9 @@ include $(top_builddir)/src/Makefile.global
 include $(top_srcdir)/contrib/contrib-global.mk
 endif
 
-majorversion=`echo $(VERSION) | sed -e 's/^\([0-9]*\.[0-9]*\).*/\1/g'`
+majorversion=`echo $(VERSION) | sed -e 's/^\([0-9]*\)\.\([0-9]*\).*/\1\2/g'`
 
 xlogdump_oid2name.o: oid2name.txt
 
 oid2name.txt:
-	cp oid2name-$(majorversion).*.txt oid2name.txt
+	cp oid2name-$(majorversion).txt oid2name.txt

gen_oid2name.sh

@@ -1,8 +1,27 @@
 #!/bin/sh
 
-PSQL_OPTS='-p 5432'
+VERSIONS="92 91 90 84 83"
 
-psql -A -t -F' ' $PSQL_OPTS postgres -c 'SELECT oid,spcname FROM pg_tablespace ORDER BY oid'
-psql -A -t -F' ' $PSQL_OPTS postgres -c 'SELECT oid,datname FROM pg_database ORDER BY oid'
-psql -A -t -F' ' $PSQL_OPTS postgres -c 'SELECT oid,relname FROM pg_class ORDER BY oid'
+PORT_OPTS='-p 5434'
 
+for v in $VERSIONS
+  do if [ -d /usr/local/pgsql${v} ]; then
+	 export PGDATA=/tmp/pgdata${v}
+         export PATH=/usr/local/pgsql${v}/bin:$PATH
+
+	 rm -rf $PGDATA
+	 mkdir $PGDATA
+         initdb --no-locale -D ${PGDATA}
+
+         pg_ctl -w -D ${PGDATA} start -o "$PORT_OPTS"
+
+	 cat /dev/null > oid2name-${v}.txt
+	 psql -A -t -F' ' $PORT_OPTS postgres -c 'SELECT oid,spcname FROM pg_tablespace ORDER BY oid' >> oid2name-${v}.txt
+	 psql -A -t -F' ' $PORT_OPTS postgres -c 'SELECT oid,datname FROM pg_database ORDER BY oid' >> oid2name-${v}.txt
+	 psql -A -t -F' ' $PORT_OPTS postgres -c 'SELECT oid,relname FROM pg_class ORDER BY oid' >> oid2name-${v}.txt
+
+         pg_ctl -w -D ${PGDATA} stop
+
+	 rm -rf ${PGDATA}
+     fi;
+done;

oid2name-8.2.21.txt

@@ -1,8 +1,8 @@
 1663 pg_default
 1664 pg_global
 1 template1
-11866 template0
-11874 postgres
+11818 template0
+11826 postgres
 112 pg_foreign_data_wrapper_oid_index
 113 pg_foreign_server_oid_index
 174 pg_user_mapping_oid_index

oid2name-8.3.15.txt renamed to oid2name-83.txt

@@ -1,8 +1,8 @@
 1663 pg_default
 1664 pg_global
 1 template1
-12690 template0
-12698 postgres
+12691 template0
+12699 postgres
 112 pg_foreign_data_wrapper_oid_index
 113 pg_foreign_server_oid_index
 174 pg_user_mapping_oid_index
@@ -276,11 +276,11 @@
 12389 foreign_data_wrapper_options
 12392 foreign_data_wrappers
 12395 _pg_foreign_servers
-12398 foreign_server_options
-12401 foreign_servers
-12404 _pg_foreign_tables
-12408 foreign_table_options
-12411 foreign_tables
-12414 _pg_user_mappings
-12417 user_mapping_options
-12421 user_mappings
+12399 foreign_server_options
+12402 foreign_servers
+12405 _pg_foreign_tables
+12409 foreign_table_options
+12412 foreign_tables
+12415 _pg_user_mappings
+12418 user_mapping_options
+12422 user_mappings