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

Modified Files:
	parser.y slonik.c 
Log Message:
Various instances where slonik would use a default node ID of 1 have been changed to remove this.

Slonik scripts may need to be changed to indicate an EVENT NODE (or
similar) after migration to v2.0 as a result.

The slonik commands involved:

- STORE NODE - EVENT NODE
- DROP NODE - EVENT NODE
- WAIT FOR EVENT - WAIT ON
- FAILOVER - BACKUP NODE
- EXECUTE SCRIPT - EVENT NODE


Index: parser.y
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/slonik/parser.y,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** parser.y	14 Feb 2008 22:21:42 -0000	1.31
--- parser.y	11 Apr 2008 15:44:23 -0000	1.32
***************
*** 566,571 ****
  						SlonikStmt_init_cluster *new;
  						statement_option opt[] = {
! 							STMT_OPTION_INT( O_ID, 1 ),
! 							STMT_OPTION_STR( O_COMMENT, "Primary Node 1" ),
  							STMT_OPTION_END
  						};
--- 566,571 ----
  						SlonikStmt_init_cluster *new;
  						statement_option opt[] = {
! 							STMT_OPTION_INT( O_ID, -1 ),
! 							STMT_OPTION_STR( O_COMMENT, "Initial Node" ),
  							STMT_OPTION_END
  						};
***************
*** 596,600 ****
  							STMT_OPTION_INT( O_ID, -1 ),
  							STMT_OPTION_STR( O_COMMENT, NULL ),
! 							STMT_OPTION_INT( O_EVENT_NODE, 1 ),
  							STMT_OPTION_END
  						};
--- 596,600 ----
  							STMT_OPTION_INT( O_ID, -1 ),
  							STMT_OPTION_STR( O_COMMENT, NULL ),
! 							STMT_OPTION_INT( O_EVENT_NODE, -1 ),
  							STMT_OPTION_END
  						};
***************
*** 625,629 ****
  						statement_option opt[] = {
  							STMT_OPTION_INT( O_ID, -1 ),
! 							STMT_OPTION_INT( O_EVENT_NODE, 1 ),
  							STMT_OPTION_END
  						};
--- 625,629 ----
  						statement_option opt[] = {
  							STMT_OPTION_INT( O_ID, -1 ),
! 							STMT_OPTION_INT( O_EVENT_NODE, -1 ),
  							STMT_OPTION_END
  						};
***************
*** 653,657 ****
  						statement_option opt[] = {
  							STMT_OPTION_INT( O_ID, -1 ),
! 							STMT_OPTION_INT( O_BACKUP_NODE, 1 ),
  							STMT_OPTION_END
  						};
--- 653,657 ----
  						statement_option opt[] = {
  							STMT_OPTION_INT( O_ID, -1 ),
! 							STMT_OPTION_INT( O_BACKUP_NODE, -1 ),
  							STMT_OPTION_END
  						};
***************
*** 1184,1188 ****
  					}
  					;
- 
  stmt_unsubscribe_set	: lno K_UNSUBSCRIBE K_SET option_list
  					{
--- 1184,1187 ----
***************
*** 1305,1309 ****
  							STMT_OPTION_INT( O_SET_ID, -1 ),
  							STMT_OPTION_STR( O_FILENAME, NULL ),
! 							STMT_OPTION_INT( O_EVENT_NODE, 1 ),
  							STMT_OPTION_INT( O_EXECUTE_ONLY_ON, -1 ),
  							STMT_OPTION_END
--- 1304,1308 ----
  							STMT_OPTION_INT( O_SET_ID, -1 ),
  							STMT_OPTION_STR( O_FILENAME, NULL ),
! 							STMT_OPTION_INT( O_EVENT_NODE, -1 ),
  							STMT_OPTION_INT( O_EXECUTE_ONLY_ON, -1 ),
  							STMT_OPTION_END
***************
*** 1336,1340 ****
  						SlonikStmt_update_functions *new;
  						statement_option opt[] = {
! 							STMT_OPTION_INT( O_ID, 1 ),
  							STMT_OPTION_END
  						};
--- 1335,1339 ----
  						SlonikStmt_update_functions *new;
  						statement_option opt[] = {
! 							STMT_OPTION_INT( O_ID, -1 ),
  							STMT_OPTION_END
  						};
***************
*** 1362,1366 ****
  						statement_option opt[] = {
  							STMT_OPTION_INT( O_SET_ID, -1 ),
! 							STMT_OPTION_INT( O_EVENT_NODE, 1 ),
  							STMT_OPTION_INT( O_EXECUTE_ONLY_ON, -1 ),
  							STMT_OPTION_END
--- 1361,1365 ----
  						statement_option opt[] = {
  							STMT_OPTION_INT( O_SET_ID, -1 ),
! 							STMT_OPTION_INT( O_EVENT_NODE, -1 ),
  							STMT_OPTION_INT( O_EXECUTE_ONLY_ON, -1 ),
  							STMT_OPTION_END
***************
*** 1394,1398 ****
  							STMT_OPTION_INT( O_ORIGIN, -1 ),
  							STMT_OPTION_INT( O_WAIT_CONFIRMED, -1 ),
! 							STMT_OPTION_INT( O_WAIT_ON, 1 ),
  							STMT_OPTION_INT( O_TIMEOUT, 600 ),
  							STMT_OPTION_END
--- 1393,1397 ----
  							STMT_OPTION_INT( O_ORIGIN, -1 ),
  							STMT_OPTION_INT( O_WAIT_CONFIRMED, -1 ),
! 							STMT_OPTION_INT( O_WAIT_ON, -1 ),
  							STMT_OPTION_INT( O_TIMEOUT, 600 ),
  							STMT_OPTION_END

Index: slonik.c
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/slonik/slonik.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -C2 -d -r1.87 -r1.88
*** slonik.c	14 Feb 2008 22:21:42 -0000	1.87
--- slonik.c	11 Apr 2008 15:44:23 -0000	1.88
***************
*** 30,33 ****
--- 30,34 ----
  #include "postgres.h"
  #include "libpq-fe.h"
+ #include "port.h"
  
  #include "slonik.h"
***************
*** 316,320 ****
  					if (stmt->ev_origin < 0)
  					{
! 						stmt->ev_origin = 1;
  					}
  					if (stmt->no_id == stmt->ev_origin)
--- 317,323 ----
  					if (stmt->ev_origin < 0)
  					{
! 						printf("%s:%d: Error: require EVENT NODE\n", 
! 						       hdr->stmt_filename, hdr->stmt_lno);
! 						errors++;
  					}
  					if (stmt->no_id == stmt->ev_origin)
***************
*** 336,339 ****
--- 339,348 ----
  					(SlonikStmt_drop_node *) hdr;
  
+ 					if (stmt->ev_origin < 0)
+ 					{
+ 						printf("%s:%d: Error: require EVENT NODE\n", 
+ 						       hdr->stmt_filename, hdr->stmt_lno);
+ 						errors++;
+ 					}
  					if (stmt->ev_origin == stmt->no_id)
  					{
***************
*** 353,356 ****
--- 362,371 ----
  					(SlonikStmt_failed_node *) hdr;
  
+ 					if (stmt->backup_node < 0)
+ 					{
+ 						printf("%s:%d: Error: require BACKUP NODE\n", 
+ 						       hdr->stmt_filename, hdr->stmt_lno);
+ 						errors++;
+ 					}
  					if (stmt->backup_node == stmt->no_id)
  					{
***************
*** 829,833 ****
  				}
  				break;
- 
  			case STMT_LOCK_SET:
  				{
--- 844,847 ----
***************
*** 926,930 ****
  					if (stmt->ev_origin < 0)
  					{
! 						stmt->ev_origin = 1;
  					}
  					if (stmt->ddl_setid < 0)
--- 940,946 ----
  					if (stmt->ev_origin < 0)
  					{
! 						printf("%s:%d: Error: require EVENT NODE\n", 
! 						       hdr->stmt_filename, hdr->stmt_lno);
! 						errors++;
  					}
  					if (stmt->ddl_setid < 0)