Update of /home/cvsd/slony1/slony1-engine/src/slonik
In directory main.slony.info:/tmp/cvs-serv2496/src/slonik

Modified Files:
	slonik.c 
Log Message:
This is the first step towards Slony-I version 2.0.

It drops all support for databases prior to Postgres version 8.3.
This is required because we now make use of new functionality in
Postgres, namely the trigger and rule support for session replication
role. As of now, every node (origin/subscriber/mixed) can be dumped
with pg_dump and result in a consistent snapshot of the database.

TODO:
  - Run DDL scripts as "local" replication role. Currently DDL
    scripts don't work at all.
  - Get rid of STORE TRIGGER and force users to make use of 8.3's
	advanced trigger and rule configuration.

Jan


Index: slonik.c
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/slonik/slonik.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** slonik.c	15 May 2007 19:40:16 -0000	1.76
--- slonik.c	31 May 2007 16:46:18 -0000	1.77
***************
*** 1810,1861 ****
  
  	/* determine what schema version we should load */
! 	if (adminfo->pg_version < 70300)	/* 7.3 and lower */
! 	{
! 		printf("%s:%d: unsupported PostgreSQL "
! 			"version %d.%d (versions < 7.3 were never supported by Slony-I)\n",
! 			stmt->stmt_filename, stmt->stmt_lno,
! 			(adminfo->pg_version/10000), ((adminfo->pg_version%10000)/100));
! 	}
! 	else if ((adminfo->pg_version >= 70300) && (adminfo->pg_version<70400)) /* 7.3 */
  	{
  		printf("%s:%d: unsupported PostgreSQL "
! 			"version %d.%d (try Slony-I 1.1.8)\n",
  			stmt->stmt_filename, stmt->stmt_lno,
  			(adminfo->pg_version/10000), ((adminfo->pg_version%10000)/100));
  	}
! 	else if ((adminfo->pg_version >= 70400) && (adminfo->pg_version<70500)) /* 7.4 */
! 	{
! 		use_major = 7;
! 		use_minor = 4;
! 	}
! 	else if ((adminfo->pg_version >= 70500) && adminfo->pg_version < 80100)	/* 8.0 */ 
! 	{
! 		use_major = 8;
! 		use_minor = 0;
! 	}
! 	else if ((adminfo->pg_version >= 80100) && adminfo->pg_version < 80300)	/* 8.1 and 8.2 */ 
  	{
  		use_major = 8;
! 		use_minor = 1;
  	}
! 	else	/* 8.3 and above */
  	{
  		use_major = 8;
! 		use_minor = 1;
  		printf("%s:%d: Possible unsupported PostgreSQL "
! 			"version (%d) %d.%d, defaulting to 8.1 support\n",
                          stmt->stmt_filename, stmt->stmt_lno, adminfo->pg_version,
  			(adminfo->pg_version/10000), ((adminfo->pg_version%10000)/100));
  	}
  
- #define ROWIDBITS "_Slony-I__rowID"
- 
- 	if (strlen(stmt->script->clustername) + strlen("ROWIDBITS") > NAMEDATALEN)
- 	{
- 		printf("Cluster name %s too long to permit creation of columns containing %s - maximum name length: %d\n",
- 			   stmt->script->clustername, ROWIDBITS, NAMEDATALEN);
- 		return -1;
- 	}
- 
  	dstring_init(&query);
  
--- 1810,1836 ----
  
  	/* determine what schema version we should load */
! 	if (adminfo->pg_version < 80300)	/* before 8.3 */
  	{
  		printf("%s:%d: unsupported PostgreSQL "
! 			"version %d.%d (versions < 8.3 are not supported by Slony-I >= 2.0)\n",
  			stmt->stmt_filename, stmt->stmt_lno,
  			(adminfo->pg_version/10000), ((adminfo->pg_version%10000)/100));
+ 			return -1;
  	}
! 	else if ((adminfo->pg_version >= 80300) && (adminfo->pg_version < 80400)) /* 8.3 */
  	{
  		use_major = 8;
! 		use_minor = 3;
  	}
! 	else	/* above 8.3 ??? */
  	{
  		use_major = 8;
! 		use_minor = 3;
  		printf("%s:%d: Possible unsupported PostgreSQL "
! 			"version (%d) %d.%d, defaulting to 8.3 support\n",
                          stmt->stmt_filename, stmt->stmt_lno, adminfo->pg_version,
  			(adminfo->pg_version/10000), ((adminfo->pg_version%10000)/100));
  	}
  
  	dstring_init(&query);
  
***************
*** 1910,1921 ****
          /* determine what schema version we should load */
  
!         if (adminfo->pg_version < 70300)        /* 7.2 and lower */
!         {
!                 printf("%s:%d: unsupported PostgreSQL "
!                         "version %d.%d\n",
!                         stmt->stmt_filename, stmt->stmt_lno,
!                         (adminfo->pg_version/10000), ((adminfo->pg_version%10000)/100));
!         }
!         else if ((adminfo->pg_version >= 70300) && (adminfo->pg_version<70400)) /* 7.3 */
          {
                  printf("%s:%d: unsupported PostgreSQL "
--- 1885,1889 ----
          /* determine what schema version we should load */
  
!         if (adminfo->pg_version < 80300)        /* before 8.3 */
          {
                  printf("%s:%d: unsupported PostgreSQL "
***************
*** 1923,1948 ****
                          stmt->stmt_filename, stmt->stmt_lno,
                          (adminfo->pg_version/10000), ((adminfo->pg_version%10000)/100));
          }
!         else if ((adminfo->pg_version >= 70400) && (adminfo->pg_version<70500)) /* 7.4 */
!         {
!                 use_major = 7;
!                 use_minor = 4;
!         }
!         else if ((adminfo->pg_version >= 70500) && adminfo->pg_version < 80100) /* 8.0 */
!         {
!                 use_major = 8;
!                 use_minor = 0;
!         }
!         else if ((adminfo->pg_version >= 80100) && adminfo->pg_version < 80300) /* 8.1, 8.2 */
          {
                  use_major = 8;
!                 use_minor = 1;
          }
!         else    /* 8.3 and above */
          {
                  use_major = 8;
!                 use_minor = 1;
                  printf("%s:%d: Possible unsupported PostgreSQL "
!                         "version %d.%d, defaulting to 8.1 support\n",
                          stmt->stmt_filename, stmt->stmt_lno,
                          (adminfo->pg_version/10000), ((adminfo->pg_version%10000)/100));
--- 1891,1907 ----
                          stmt->stmt_filename, stmt->stmt_lno,
                          (adminfo->pg_version/10000), ((adminfo->pg_version%10000)/100));
+ 			return -1;
          }
!         else if ((adminfo->pg_version >= 80300) && adminfo->pg_version < 80400) /* 8.0 */
          {
                  use_major = 8;
!                 use_minor = 3;
          }
!         else    /* above 8.3 */
          {
                  use_major = 8;
!                 use_minor = 3;
                  printf("%s:%d: Possible unsupported PostgreSQL "
!                         "version %d.%d, defaulting to 8.3 support\n",
                          stmt->stmt_filename, stmt->stmt_lno,
                          (adminfo->pg_version/10000), ((adminfo->pg_version%10000)/100));