[H2-commits] r1113 - in humano2/trunk: components/webTools core/db/pgsql core/schema/mssql core/sche

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Author: marijn
Date: 2005-05-20 12:38:51 -0400 (Fri, 20 May 2005)
New Revision: 1113

Modified:
   humano2/trunk/components/webTools/Adapter.cs
   humano2/trunk/core/db/pgsql/pgsqlComplex.cs
   humano2/trunk/core/schema/mssql/mssql-1-metadata.sql
   humano2/trunk/core/schema/pgsql/pgsql-1-metadata.sql
Log:
Fixing bug #121
 * If a class that is a attribute type is marked as "isHidden" it does no=
t show up in the list of attributes in builder.


Modified: humano2/trunk/components/webTools/Adapter.cs
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D

--- humano2/trunk/components/webTools/Adapter.cs	2005-05-20 16:10:19 UTC =
(rev 1112)
+++ humano2/trunk/components/webTools/Adapter.cs	2005-05-20 16:38:51 UTC =
(rev 1113)
@@ -212,17 +212,6 @@
 			DataTable res;
 			res =3D complex.GetAttributes();
=20
-			int inheritenceIndex =3D -1;
-			for(int i =3D 0; i < res.Rows.Count; i++)=20
-			{
-			    if(Convert.ToInt32(res.Rows[i]["id_entity"]) =3D=3D (int) MetaMod=
elConsts.EntitiesInheritance)
-				{
-				  inheritenceIndex =3D i;
-				}
-			}
-		=09
-			res.Rows.RemoveAt(inheritenceIndex); // Zap the inheritance attribute=
.
-
 			return res;
 		}
=20

Modified: humano2/trunk/core/db/pgsql/pgsqlComplex.cs
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/trunk/core/db/pgsql/pgsqlComplex.cs	2005-05-20 16:10:19 UTC (=
rev 1112)
+++ humano2/trunk/core/db/pgsql/pgsqlComplex.cs	2005-05-20 16:38:51 UTC (=
rev 1113)
@@ -212,7 +212,7 @@
 			string query;
 			DataTable res;
=20
-			query =3D @"select id_entity, name from class where ""parentId"" =3D =
5 or ""parentId"" in (select id_entity from class where ""parentId"" =3D =
5)";
+			query =3D @"select id_entity, name from class where ( ""parentId"" =3D=
 5 or ""parentId"" in (select id_entity from class where ""parentId"" =3D=
 5) ) and ""isHidden"" =3D '0'";
=20
 			res =3D this.doSelect(query);
 			return res;

Modified: humano2/trunk/core/schema/mssql/mssql-1-metadata.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/trunk/core/schema/mssql/mssql-1-metadata.sql	2005-05-20 16:10=
:19 UTC (rev 1112)
+++ humano2/trunk/core/schema/mssql/mssql-1-metadata.sql	2005-05-20 16:38=
:51 UTC (rev 1113)
@@ -232,26 +232,26 @@
 INSERT INTO "classType"  ("id_entity","sysClassTypeName","parentClassTyp=
e")  VALUES (27,'component',NULL);
 INSERT INTO "classType"  ("id_entity","sysClassTypeName","parentClassTyp=
e")  VALUES (29,'solutionData',NULL);
=20
-INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract")  VALUES (1,1,  'classType','classType',3,0);
-INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract")  VALUES (2,1,  'class','class',3,0);
-INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract")  VALUES (3,1,  'entity','entity',NULL,1);
-INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract")  VALUES (5,1, 'attribute','attribute',3,1);
-INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract")  VALUES (6,27, 'domain','domain',3,0);
-INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract")  VALUES (7,27,  'user','user',3,0);
-INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract")  VALUES (8,1, 'textline','textline',5,0);
-INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract")  VALUES (9,1, 'numeric','numeric',5,0);
-INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract")  VALUES (12,1,'dateTime','dateTime',5,0);
-INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract")  VALUES (13,1,'text','text',5,0);
-INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract")  VALUES (14,1,'inheritance','inheritance',5,0);
-INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract")  VALUES (15,1,'choice','choice',81,0);
-INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract")  VALUES (26,27,'user_domain','user_domain',3,0);
-INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract")  VALUES (39,1,'file','file',5,0);
-INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract")  VALUES (80,1, 'option','option',3,0);
-INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract")  VALUES (81,1,'pertinence','pertinence',5,0);
-INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract")  VALUES (82,1,'Boolean','Boolean',5,0);
-INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract")  VALUES (130,1,'optionGroup','optionGroup',3,0);
-INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract")  VALUES (149,1,'displayAttribute','displayAttribute',3,0)=
;
-INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract")  VALUES (153,1,'version','version',3,0);
+INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden")  VALUES (1,1,  'classType','classType',3,0, 0=
);
+INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden")  VALUES (2,1,  'class','class',3,0, 0);
+INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden")  VALUES (3,1,  'entity','entity',NULL,1);
+INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden")  VALUES (5,1, 'attribute','attribute',3,1);
+INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden")  VALUES (6,27, 'domain','domain',3,0, 0);
+INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden")  VALUES (7,27,  'user','user',3,0, 0);
+INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden")  VALUES (8,1, 'textline','textline',5,0, 0);
+INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden")  VALUES (9,1, 'numeric','numeric',5,0, 0);
+INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden")  VALUES (12,1,'dateTime','dateTime',5,0, 0);
+INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden")  VALUES (13,1,'text','text',5,0, 0);
+INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden")  VALUES (14,1,'inheritance','inheritance',5,0=
, 1);
+INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden")  VALUES (15,1,'choice','choice',81,0, 1);
+INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden")  VALUES (26,27,'user_domain','user_domain',3,=
0, 0);
+INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden")  VALUES (39,1,'file','file',5,0, 0);
+INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden")  VALUES (80,1, 'option','option',3,0, 0);
+INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden")  VALUES (81,1,'pertinence','pertinence',5,0, =
0);
+INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden")  VALUES (82,1,'Boolean','Boolean',5,0, 0);
+INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden")  VALUES (130,1,'optionGroup','optionGroup',3,=
0, 0);
+INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden")  VALUES (149,1,'displayAttribute','displayAtt=
ribute',3,0, 0);
+INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden")  VALUES (153,1,'version','version',3,0, 0);
=20
 SET IDENTITY_INSERT "entity" ON=20
 INSERT INTO "entity"  ("id_entity","domainId","class","delDate","status"=
)  VALUES (1,10,2,NULL,NULL);

Modified: humano2/trunk/core/schema/pgsql/pgsql-1-metadata.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/trunk/core/schema/pgsql/pgsql-1-metadata.sql	2005-05-20 16:10=
:19 UTC (rev 1112)
+++ humano2/trunk/core/schema/pgsql/pgsql-1-metadata.sql	2005-05-20 16:38=
:51 UTC (rev 1113)
@@ -232,26 +232,26 @@
 INSERT INTO "classType"  ("id_entity","sysClassTypeName","parentClassTyp=
e")  VALUES (27,'component',NULL);
 INSERT INTO "classType"  ("id_entity","sysClassTypeName","parentClassTyp=
e")  VALUES (29,'solutionData',NULL);
=20
-INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract")  VALUES (1,1,  'classType','classType',3,'f');
-INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract")  VALUES (2,1,  'class','class',3,'f');
-INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract")  VALUES (3,1,  'entity','entity',NULL,'t');
-INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract")  VALUES (5,1, 'attribute','attribute',3,'t');
-INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract")  VALUES (6,27, 'domain','domain',3,'f');
-INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract")  VALUES (7,27,  'user','user',3,'f');
-INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract")  VALUES (8,1, 'textline','textline',5,'f');
-INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract")  VALUES (9,1, 'numeric','numeric',5,'f');
-INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract")  VALUES (12,1,'dateTime','dateTime',5,'f');
-INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract")  VALUES (13,1,'text','text',5,'f');
-INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract")  VALUES (14,1,'inheritance','inheritance',5,'f');
-INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract")  VALUES (15,1,'choice','choice',81,'f');
-INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract")  VALUES (26,27,'user_domain','user_domain',3,'f');
-INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract")  VALUES (39,1,'file','file',5,'f');
-INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract")  VALUES (80,1, 'option','option',3,'f');
-INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract")  VALUES (81,1,'pertinence','pertinence',5,'f');
-INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract")  VALUES (82,1,'boolean','boolean',5,'f');
-INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract")  VALUES (130,1,'optionGroup','optionGroup',3,'f');
-INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract")  VALUES (149,1,'displayAttribute','displayAttribute',3,'f=
');
-INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract")  VALUES (153,1,'version','version',3,'f');
+INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden")  VALUES (1,1,  'classType','classType',3,'f',=
 'f');
+INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden")  VALUES (2,1,  'class','class',3,'f', 'f');
+INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden")  VALUES (3,1,  'entity','entity',NULL,'t');
+INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden")  VALUES (5,1, 'attribute','attribute',3,'t');
+INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden")  VALUES (6,27, 'domain','domain',3,'f', 'f');
+INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden")  VALUES (7,27,  'user','user',3,'f', 'f');
+INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden")  VALUES (8,1, 'textline','textline',5,'f', 'f=
');
+INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden")  VALUES (9,1, 'numeric','numeric',5,'f', 'f')=
;
+INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden")  VALUES (12,1,'dateTime','dateTime',5,'f', 'f=
');
+INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden")  VALUES (13,1,'text','text',5,'f', 'f');
+INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden")  VALUES (14,1,'inheritance','inheritance',5,'=
f', 't');
+INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden")  VALUES (15,1,'choice','choice',81,'f', 't');
+INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden")  VALUES (26,27,'user_domain','user_domain',3,=
'f', 'f');
+INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden")  VALUES (39,1,'file','file',5,'f', 'f');
+INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden")  VALUES (80,1, 'option','option',3,'f', 'f');
+INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden")  VALUES (81,1,'pertinence','pertinence',5,'f'=
, 'f');
+INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden")  VALUES (82,1,'boolean','boolean',5,'f', 'f')=
;
+INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden")  VALUES (130,1,'optionGroup','optionGroup',3,=
'f', 'f');
+INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden")  VALUES (149,1,'displayAttribute','displayAtt=
ribute',3,'f', 'f');
+INSERT INTO "class"  ("id_entity","classType","sysName","name","parentId=
","isAbstract", "isHidden")  VALUES (153,1,'version','version',3,'f', 'f'=
);
=20
 INSERT INTO "entity"  ("id_entity","domainId","class","delDate","status"=
)  VALUES (1,10,2,NULL,NULL);
 INSERT INTO "entity"  ("id_entity","domainId","class","delDate","status"=
)  VALUES (2,10,2,NULL,NULL);





[H2-commits] r1113 - in humano2/trunk: components/webTools core/db/pgsql core/schema/mssql core/sche

[H2-commits] r1113 - in humano2/trunk: components/webTools core/db/pgsql core/schema/mssql core/schema/pgsql