adapdev-commits

[Sean M. <int...@us...>]

Update of /cvsroot/adapdev/Adapdev/src/Adapdev.CodeGen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9855/src/Adapdev.CodeGen

Modified Files:
	NVelocityTableCodeTemplate.cs 
Log Message:


Index: NVelocityTableCodeTemplate.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.CodeGen/NVelocityTableCodeTemplate.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** NVelocityTableCodeTemplate.cs	17 Mar 2005 12:50:09 -0000	1.2
--- NVelocityTableCodeTemplate.cs	25 Mar 2005 02:14:28 -0000	1.3
***************
*** 129,138 ****
  				ISelectQuery query = QueryFactory.CreateSelectQuery(di.DatabaseType, di.DatabaseProviderType);
  				query.SetTable(ts.Name);
! 				foreach (ColumnSchema ci in ts.GetOrdinalColumns().Values)
  				{
  					if(ci.IsActive)query.Add(ci.Name);
  				}
  
! 				ArrayList pks = new ArrayList(ts.GetPrimaryKeys().Values);
  				ColumnSchema pk = (ColumnSchema) pks[0];
  
--- 129,138 ----
  				ISelectQuery query = QueryFactory.CreateSelectQuery(di.DatabaseType, di.DatabaseProviderType);
  				query.SetTable(ts.Name);
! 				foreach (ColumnSchema ci in ts.OrdinalColumns.Values)
  				{
  					if(ci.IsActive)query.Add(ci.Name);
  				}
  
! 				ArrayList pks = new ArrayList(ts.PrimaryKeys.Values);
  				ColumnSchema pk = (ColumnSchema) pks[0];
  
***************
*** 167,171 ****
  			query.SetTable(ts.Name);
  
! 			foreach (ColumnSchema ci in ts.GetSortedColumns().Values)
  			{
  				if (!ci.IsAutoIncrement && ci.IsActive) query.Add(ci.Name);
--- 167,171 ----
  			query.SetTable(ts.Name);
  
! 			foreach (ColumnSchema ci in ts.SortedColumns.Values)
  			{
  				if (!ci.IsAutoIncrement && ci.IsActive) query.Add(ci.Name);
***************
*** 193,202 ****
  			query.SetTable(ts.Name);
  
! 			foreach (ColumnSchema ci in ts.GetSortedColumns().Values)
  			{
  				if (!ci.IsAutoIncrement && ci.IsActive) query.Add(ci.Name);
  			}
  
! 			ArrayList pks = new ArrayList(ts.GetPrimaryKeys().Values);
  
  			ICriteria criteria = query.CreateCriteria();
--- 193,202 ----
  			query.SetTable(ts.Name);
  
! 			foreach (ColumnSchema ci in ts.SortedColumns.Values)
  			{
  				if (!ci.IsAutoIncrement && ci.IsActive) query.Add(ci.Name);
  			}
  
! 			ArrayList pks = new ArrayList(ts.PrimaryKeys.Values);
  
  			ICriteria criteria = query.CreateCriteria();
***************
*** 236,240 ****
  				query.SetTable(ts.Name);
  
! 				ArrayList pks = new ArrayList(ts.GetPrimaryKeys().Values);
  				ColumnSchema pk = (ColumnSchema) pks[0];
  
--- 236,240 ----
  				query.SetTable(ts.Name);
  
! 				ArrayList pks = new ArrayList(ts.PrimaryKeys.Values);
  				ColumnSchema pk = (ColumnSchema) pks[0];
  
***************
*** 271,275 ****
  			query.SetTable(ts.Name);
  
! 			foreach (ColumnSchema ci2 in ts.GetOrdinalColumns().Values)
  			{
  				if(ci2.IsActive)query.Add(ci2.Name);
--- 271,275 ----
  			query.SetTable(ts.Name);
  
! 			foreach (ColumnSchema ci2 in ts.OrdinalColumns.Values)
  			{
  				if(ci2.IsActive)query.Add(ci2.Name);
***************
*** 343,347 ****
  
  			// Get all columns that aren't autoincrement
! 			foreach(ColumnSchema cs in ts.GetSortedColumns().Values)
  			{
  				if(!cs.IsAutoIncrement && cs.IsActive)al.Add(cs);
--- 343,347 ----
  
  			// Get all columns that aren't autoincrement
! 			foreach(ColumnSchema cs in ts.SortedColumns.Values)
  			{
  				if(!cs.IsAutoIncrement && cs.IsActive)al.Add(cs);
***************
*** 369,377 ****
  			int i = 1;
  			StringBuilder sb = new StringBuilder();
! 			foreach (ColumnSchema columnSchema in ts.GetSortedColumns().Values)
  			{
  				if(columnSchema.IsActive)
  				{
! 					if(i < ts.GetSortedColumns().Count)
  					{
  						sb.Append(this.GetParameterName(columnSchema.Name) + " " + columnSchema.DataType.ToLower() + "," + Environment.NewLine);
--- 369,377 ----
  			int i = 1;
  			StringBuilder sb = new StringBuilder();
! 			foreach (ColumnSchema columnSchema in ts.SortedColumns.Values)
  			{
  				if(columnSchema.IsActive)
  				{
! 					if(i < ts.SortedColumns.Count)
  					{
  						sb.Append(this.GetParameterName(columnSchema.Name) + " " + columnSchema.DataType.ToLower() + "," + Environment.NewLine);