[pgsqlclient-checkins] SF.net SVN: pgsqlclient: [110] trunk/PostgreSqlClient/source/PostgreSql/Data/Schema

[<car...@us...>]

Revision: 110
Author:   carlosga_fb
Date:     2006-04-12 11:12:39 -0700 (Wed, 12 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/pgsqlclient/?rev=110&view=rev

Log Message:
-----------


Modified Paths:
--------------
    trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/MetaData.xml
    trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgColumns.cs
    trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgFunctionParameters.cs
    trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgFunctions.cs
    trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgTables.cs
    trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgViewColumns.cs
Modified: trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/MetaData.xml
===================================================================
--- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/MetaData.xml	2006-04-12 17:23:52 UTC (rev 109)
+++ trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/MetaData.xml	2006-04-12 18:12:39 UTC (rev 110)
@@ -839,7 +839,7 @@
 		<DbType>15</DbType>
 	</DataTypes>
 	<DataTypes>
-		<TypeName>character</TypeName>
+		<TypeName>char</TypeName>
 		<ProviderDbType>5</ProviderDbType>
 		<ColumnSize>2147483647</ColumnSize>
 		<CreateFormat />
@@ -1089,7 +1089,7 @@
 		<DbType>6</DbType>
 	</DataTypes>
 	<DataTypes>
-		<TypeName>boolean</TypeName>
+		<TypeName>bool</TypeName>
 		<ProviderDbType>2</ProviderDbType>
 		<ColumnSize>1</ColumnSize>
 		<CreateFormat />

Modified: trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgColumns.cs
===================================================================
--- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgColumns.cs	2006-04-12 17:23:52 UTC (rev 109)
+++ trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgColumns.cs	2006-04-12 18:12:39 UTC (rev 110)
@@ -92,13 +92,13 @@
 				// TABLE_NAME
 				if (restrictions.Length > 2 && restrictions[2] != null)
 				{
-                    sql += String.Format("pg_class.relname = '{0}'", restrictions[2]);
+                    sql += String.Format(" and pg_class.relname = '{0}'", restrictions[2]);
 				}
 
 				// COLUMN_NAME
 				if (restrictions.Length > 3 && restrictions[3] != null)
 				{
-                    sql += String.Format("pg_attribute.attname = '{0}'", restrictions[3]);
+                    sql += String.Format(" and pg_attribute.attname = '{0}'", restrictions[3]);
 				}
 			}
 

Modified: trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgFunctionParameters.cs
===================================================================
--- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgFunctionParameters.cs	2006-04-12 17:23:52 UTC (rev 109)
+++ trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgFunctionParameters.cs	2006-04-12 18:12:39 UTC (rev 110)
@@ -64,8 +64,13 @@
                 }
             }
 
-            sql += "WHERE " + where + " ORDER BY pg_namespace.nspname, pg_proc.proname";
+            if (where.Length > 0)
+            {
+                sql += "WHERE " + where;
+            }
 
+            sql += " ORDER BY pg_namespace.nspname, pg_proc.proname";
+
             return sql;
         }
 

Modified: trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgFunctions.cs
===================================================================
--- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgFunctions.cs	2006-04-12 17:23:52 UTC (rev 109)
+++ trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgFunctions.cs	2006-04-12 18:12:39 UTC (rev 110)
@@ -83,7 +83,7 @@
 
             if (where.Length > 0)
             {
-                sql += "WHERE " + where;
+                sql += " WHERE " + where;
             }
 
             sql += " ORDER BY pg_namespace.nspname, pg_proc.proname";

Modified: trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgTables.cs
===================================================================
--- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgTables.cs	2006-04-12 17:23:52 UTC (rev 109)
+++ trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgTables.cs	2006-04-12 18:12:39 UTC (rev 110)
@@ -49,8 +49,6 @@
                     "left join pg_tablespace ON pg_class.reltablespace = pg_tablespace.oid " +
                     "left join pg_description ON pg_class.oid = pg_description.objoid ";
 
-            sql += "WHERE ";
-
             if (restrictions != null && restrictions.Length > 0)
             {
                 // TABLE_CATALOG
@@ -111,8 +109,13 @@
                 where += " pg_class.relkind = 'r'";
             }
 
-			sql += where + " ORDER BY pg_class.relkind, pg_namespace.nspname, pg_class.relname";
+            if (where.Length > 0)
+            {
+                sql += " WHERE " + where;
+            }
 
+			sql += " ORDER BY pg_class.relkind, pg_namespace.nspname, pg_class.relname";
+
 			return sql;
 		}
 

Modified: trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgViewColumns.cs
===================================================================
--- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgViewColumns.cs	2006-04-12 17:23:52 UTC (rev 109)
+++ trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgViewColumns.cs	2006-04-12 18:12:39 UTC (rev 110)
@@ -93,13 +93,13 @@
                 // VIEW_NAME
                 if (restrictions.Length > 2 && restrictions[2] != null)
                 {
-                    sql += String.Format("pg_class.relname = '{0}'", restrictions[2]);
+                    sql += String.Format(" and pg_class.relname = '{0}'", restrictions[2]);
                 }
 
                 // COLUMN_NAME
                 if (restrictions.Length > 3 && restrictions[3] != null)
                 {
-                    sql += String.Format("pg_attribute.attname = '{0}'", restrictions[3]);
+                    sql += String.Format(" and pg_attribute.attname = '{0}'", restrictions[3]);
                 }
             }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.