Menu
▾
▴
[Firebird-checkins] CVS: NETProvider/NETProvider_20/source/FirebirdSql/Data/Schema FbColumns.cs,1.9,1.10 FbDomains.cs,1.9,1.10 FbForeignKeys.cs,1.9,1.10 FbMetaData.xml,1.6,1.7 FbProcedureParameters.cs,1.10,1.11 FbViewColumns.cs,1.1,1.2
Update of /cvsroot/firebird/NETProvider/NETProvider_20/source/FirebirdSql/Data/Schema In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29506 Modified Files: FbColumns.cs FbDomains.cs FbForeignKeys.cs FbMetaData.xml FbProcedureParameters.cs FbViewColumns.cs Log Message: 2005-09-02 Carlos Guzman Alvarez <car...@te...> * FirebirdSql\Data\Schema\FbColumns.cs: * FirebirdSql\Data\Schema\FbDomains.cs: * FirebirdSql\Data\Schema\FbViewColumns.cs: * FirebirdSql\Data\Schema\FbStoredProcedureParameters.cs: - Set 0 as the value of the Precision column when it's DBNull Index: FbColumns.cs =================================================================== RCS file: /cvsroot/firebird/NETProvider/NETProvider_20/source/FirebirdSql/Data/Schema/FbColumns.cs,v retrieving revision 1.9 retrieving revision 1.10 diff -b -U3 -r1.9 -r1.10 --- FbColumns.cs 26 Aug 2005 21:49:22 -0000 1.9 +++ FbColumns.cs 2 Sep 2005 17:01:23 -0000 1.10 @@ -168,8 +168,12 @@ row["CHARACTER_OCTET_LENGTH"] = 0; } - if (row["NUMERIC_PRECISION"] == System.DBNull.Value && - (dbType == FbDbType.Decimal || dbType == FbDbType.Numeric)) + if (row["NUMERIC_PRECISION"] == System.DBNull.Value) + { + row["NUMERIC_PRECISION"] = 0; + } + + if (dbType == FbDbType.Decimal || dbType == FbDbType.Numeric) { row["NUMERIC_PRECISION"] = row["COLUMN_SIZE"]; } Index: FbDomains.cs =================================================================== RCS file: /cvsroot/firebird/NETProvider/NETProvider_20/source/FirebirdSql/Data/Schema/FbDomains.cs,v retrieving revision 1.9 retrieving revision 1.10 diff -b -U3 -r1.9 -r1.10 --- FbDomains.cs 26 Aug 2005 21:49:22 -0000 1.9 +++ FbDomains.cs 2 Sep 2005 17:01:23 -0000 1.10 @@ -132,8 +132,12 @@ row["DOMAIN_SIZE"] = Int32.MaxValue; } - if (row["NUMERIC_PRECISION"] == System.DBNull.Value && - (dbType == FbDbType.Decimal || dbType == FbDbType.Numeric)) + if (row["NUMERIC_PRECISION"] == System.DBNull.Value) + { + row["NUMERIC_PRECISION"] = 0; + } + + if (dbType == FbDbType.Decimal || dbType == FbDbType.Numeric) { row["NUMERIC_PRECISION"] = row["DOMAIN_SIZE"]; } Index: FbForeignKeys.cs =================================================================== RCS file: /cvsroot/firebird/NETProvider/NETProvider_20/source/FirebirdSql/Data/Schema/FbForeignKeys.cs,v retrieving revision 1.9 retrieving revision 1.10 diff -b -U3 -r1.9 -r1.10 --- FbForeignKeys.cs 1 Sep 2005 13:38:55 -0000 1.9 +++ FbForeignKeys.cs 2 Sep 2005 17:01:23 -0000 1.10 @@ -55,7 +55,7 @@ "rdb$indices refidx "); where.Append( - "co.rdb$constraint_name = ref.rdb$constraint_name and"); + "co.rdb$constraint_name = ref.rdb$constraint_name and "); where.Append( "ref.rdb$const_name_uq = refidx.rdb$index_name"); Index: FbMetaData.xml =================================================================== RCS file: /cvsroot/firebird/NETProvider/NETProvider_20/source/FirebirdSql/Data/Schema/FbMetaData.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -b -U3 -r1.6 -r1.7 --- FbMetaData.xml 27 Aug 2005 13:50:34 -0000 1.6 +++ FbMetaData.xml 2 Sep 2005 17:01:23 -0000 1.7 @@ -439,36 +439,60 @@ </Restrictions> <Restrictions> <CollectionName>ForeignKeys</CollectionName> + <RestrictionName>ConstraintCatalog</RestrictionName> + <RestrictionDefault>constraint_catalog</RestrictionDefault> + <RestrictionNumber>1</RestrictionNumber> + </Restrictions> + <Restrictions> + <CollectionName>ForeignKeys</CollectionName> + <RestrictionName>ConstraintSchema</RestrictionName> + <RestrictionDefault>constraint_schema</RestrictionDefault> + <RestrictionNumber>2</RestrictionNumber> + </Restrictions> + <Restrictions> + <CollectionName>ForeignKeys</CollectionName> + <RestrictionName>TableName</RestrictionName> + <RestrictionDefault>table_name</RestrictionDefault> + <RestrictionNumber>3</RestrictionNumber> + </Restrictions> + <Restrictions> + <CollectionName>ForeignKeys</CollectionName> + <RestrictionName>ConstraintName</RestrictionName> + <RestrictionDefault>constraint_name</RestrictionDefault> + <RestrictionNumber>4</RestrictionNumber> + </Restrictions> + <Restrictions> + <CollectionName>ForeignKeyColumns</CollectionName> <RestrictionName>PkTableCatalog</RestrictionName> <RestrictionDefault>pk_table_catalog</RestrictionDefault> <RestrictionNumber>1</RestrictionNumber> </Restrictions> <Restrictions> - <CollectionName>ForeignKeys</CollectionName> + <CollectionName>ForeignKeyColumns</CollectionName> <RestrictionName>PkTableSchema</RestrictionName> <RestrictionDefault>pk_table_schema</RestrictionDefault> <RestrictionNumber>2</RestrictionNumber> </Restrictions> <Restrictions> - <CollectionName>ForeignKeys</CollectionName> + <CollectionName>ForeignKeyColumns</CollectionName> <RestrictionName>PkTableName</RestrictionName> <RestrictionDefault>pk_table_name</RestrictionDefault> <RestrictionNumber>3</RestrictionNumber> </Restrictions> <Restrictions> - <CollectionName>ForeignKeys</CollectionName> + <CollectionName>ForeignKeyColumns</CollectionName> <RestrictionName>FkTableCatalog</RestrictionName> <RestrictionDefault>fk_table_catalog</RestrictionDefault> <RestrictionNumber>4</RestrictionNumber> </Restrictions> <Restrictions> - <CollectionName>ForeignKeys</CollectionName> + <CollectionName>ForeignKeyColumns</CollectionName> <RestrictionName>FkTableSchema</RestrictionName> <RestrictionDefault>fk_table_schema</RestrictionDefault> <RestrictionNumber>5</RestrictionNumber> </Restrictions> <Restrictions> - <CollectionName>ForeignKeys</CollectionName> + <CollectionName>ForeignKeyColumns</CollectionName> <RestrictionName>FkTableName</RestrictionName> <RestrictionDefault>fk_table_name</RestrictionDefault> <RestrictionNumber>6</RestrictionNumber> Index: FbProcedureParameters.cs =================================================================== RCS file: /cvsroot/firebird/NETProvider/NETProvider_20/source/FirebirdSql/Data/Schema/FbProcedureParameters.cs,v retrieving revision 1.10 retrieving revision 1.11 diff -b -U3 -r1.10 -r1.11 --- FbProcedureParameters.cs 26 Aug 2005 21:49:22 -0000 1.10 +++ FbProcedureParameters.cs 2 Sep 2005 17:01:23 -0000 1.11 @@ -145,8 +145,12 @@ row["PARAMETER_SIZE"] = Int32.MaxValue; } - if (row["NUMERIC_PRECISION"] == System.DBNull.Value && - (dbType == FbDbType.Decimal || dbType == FbDbType.Numeric)) + if (row["NUMERIC_PRECISION"] == System.DBNull.Value) + { + row["NUMERIC_PRECISION"] = 0; + } + + if (dbType == FbDbType.Decimal || dbType == FbDbType.Numeric) { row["NUMERIC_PRECISION"] = row["PARAMETER_SIZE"]; } Index: FbViewColumns.cs =================================================================== RCS file: /cvsroot/firebird/NETProvider/NETProvider_20/source/FirebirdSql/Data/Schema/FbViewColumns.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -b -U3 -r1.1 -r1.2 --- FbViewColumns.cs 26 Aug 2005 22:26:20 -0000 1.1 +++ FbViewColumns.cs 2 Sep 2005 17:01:23 -0000 1.2 @@ -163,8 +163,12 @@ row["COLUMN_SIZE"] = Int32.MaxValue; } - if (row["NUMERIC_PRECISION"] == System.DBNull.Value && - (dbType == FbDbType.Decimal || dbType == FbDbType.Numeric)) + if (row["NUMERIC_PRECISION"] == System.DBNull.Value) + { + row["NUMERIC_PRECISION"] = 0; + } + + if (dbType == FbDbType.Decimal || dbType == FbDbType.Numeric) { row["NUMERIC_PRECISION"] = row["COLUMN_SIZE"]; } |