Skip to content

Commit eb7ad55

Browse files
sjh37sjh37
committed
#527 DataType annotation namespace clash causes build failure. Thanks to Janis Simsons.
1 parent cdf494e commit eb7ad55

File tree

6 files changed

+31
-31
lines changed

6 files changed

+31
-31
lines changed

‎EntityFramework.Reverse.POCO.Generator/Database NorthwindSqlCe40.tt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,12 +93,12 @@
9393
// It is used to set a data annotation on a column based on the columns's MS SQL type.
9494
// Make sure the column name is lowercase in the following array, regardless of how it is in the database
9595
// Column name DataAnnotation to add
96-
{ "date", "DataType(DataType.Date)" },
97-
{ "datetime", "DataType(DataType.DateTime)" },
98-
{ "datetime2", "DataType(DataType.DateTime)" },
99-
{ "datetimeoffset", "DataType(DataType.DateTime)" },
100-
{ "smallmoney", "DataType(DataType.Currency)" },
101-
{ "money", "DataType(DataType.Currency)" }
96+
{ "date", "DataType(System.ComponentModel.DataAnnotations.DataType.Date)" },
97+
{ "datetime", "DataType(System.ComponentModel.DataAnnotations.DataType.DateTime)" },
98+
{ "datetime2", "DataType(System.ComponentModel.DataAnnotations.DataType.DateTime)" },
99+
{ "datetimeoffset", "DataType(System.ComponentModel.DataAnnotations.DataType.DateTime)" },
100+
{ "smallmoney", "DataType(System.ComponentModel.DataAnnotations.DataType.Currency)" },
101+
{ "money", "DataType(System.ComponentModel.DataAnnotations.DataType.Currency)" }
102102
};
103103

104104
// Migrations *************************************************************************************************************************

‎EntityFramework.Reverse.POCO.Generator/Database.tt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,12 @@
9999
// It is used to set a data annotation on a column based on the columns's MS SQL type.
100100
// Make sure the column name is lowercase in the following array, regardless of how it is in the database
101101
// Column name DataAnnotation to add
102-
{ "date", "DataType(DataType.Date)" },
103-
{ "datetime", "DataType(DataType.DateTime)" },
104-
{ "datetime2", "DataType(DataType.DateTime)" },
105-
{ "datetimeoffset", "DataType(DataType.DateTime)" },
106-
{ "smallmoney", "DataType(DataType.Currency)" },
107-
{ "money", "DataType(DataType.Currency)" }
102+
{ "date", "DataType(System.ComponentModel.DataAnnotations.DataType.Date)" },
103+
{ "datetime", "DataType(System.ComponentModel.DataAnnotations.DataType.DateTime)" },
104+
{ "datetime2", "DataType(System.ComponentModel.DataAnnotations.DataType.DateTime)" },
105+
{ "datetimeoffset", "DataType(System.ComponentModel.DataAnnotations.DataType.DateTime)" },
106+
{ "smallmoney", "DataType(System.ComponentModel.DataAnnotations.DataType.Currency)" },
107+
{ "money", "DataType(System.ComponentModel.DataAnnotations.DataType.Currency)" }
108108
};
109109

110110
// Migrations *************************************************************************************************************************

‎Tester/TestDatabase_DataAnnotation.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -676,7 +676,7 @@ public class ColumnName
676676

677677
[Column(@"someDate", Order = 9, TypeName = "datetime2")]
678678
[Required]
679-
[DataType(DataType.DateTime)]
679+
[DataType(System.ComponentModel.DataAnnotations.DataType.DateTime)]
680680
[Display(Name = "Some date")]
681681
public System.DateTime SomeDate { get; set; } // someDate
682682

‎Tester/TestDatabase_DataAnnotation.tt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,12 @@
9898
// It is used to set a data annotation on a column based on the columns's MS SQL type.
9999
// Make sure the column name is lowercase in the following array, regardless of how it is in the database
100100
// Column name DataAnnotation to add
101-
{ "date", "DataType(DataType.Date)" },
102-
{ "datetime", "DataType(DataType.DateTime)" },
103-
{ "datetime2", "DataType(DataType.DateTime)" },
104-
{ "datetimeoffset", "DataType(DataType.DateTime)" },
105-
{ "smallmoney", "DataType(DataType.Currency)" },
106-
{ "money", "DataType(DataType.Currency)" }
101+
{ "date", "DataType(System.ComponentModel.DataAnnotations.DataType.Date)" },
102+
{ "datetime", "DataType(System.ComponentModel.DataAnnotations.DataType.DateTime)" },
103+
{ "datetime2", "DataType(System.ComponentModel.DataAnnotations.DataType.DateTime)" },
104+
{ "datetimeoffset", "DataType(System.ComponentModel.DataAnnotations.DataType.DateTime)" },
105+
{ "smallmoney", "DataType(System.ComponentModel.DataAnnotations.DataType.Currency)" },
106+
{ "money", "DataType(System.ComponentModel.DataAnnotations.DataType.Currency)" }
107107
};
108108

109109
// Migrations *************************************************************************************************************************

‎Tester/TestDatabase_NoDataAnnotation.tt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,12 @@
9898
// It is used to set a data annotation on a column based on the columns's MS SQL type.
9999
// Make sure the column name is lowercase in the following array, regardless of how it is in the database
100100
// Column name DataAnnotation to add
101-
{ "date", "DataType(DataType.Date)" },
102-
{ "datetime", "DataType(DataType.DateTime)" },
103-
{ "datetime2", "DataType(DataType.DateTime)" },
104-
{ "datetimeoffset", "DataType(DataType.DateTime)" },
105-
{ "smallmoney", "DataType(DataType.Currency)" },
106-
{ "money", "DataType(DataType.Currency)" }
101+
{ "date", "DataType(System.ComponentModel.DataAnnotations.DataType.Date)" },
102+
{ "datetime", "DataType(System.ComponentModel.DataAnnotations.DataType.DateTime)" },
103+
{ "datetime2", "DataType(System.ComponentModel.DataAnnotations.DataType.DateTime)" },
104+
{ "datetimeoffset", "DataType(System.ComponentModel.DataAnnotations.DataType.DateTime)" },
105+
{ "smallmoney", "DataType(System.ComponentModel.DataAnnotations.DataType.Currency)" },
106+
{ "money", "DataType(System.ComponentModel.DataAnnotations.DataType.Currency)" }
107107
};
108108

109109
// Migrations *************************************************************************************************************************

‎Tester/TestSynonymsDatabase.tt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,12 @@
9898
// It is used to set a data annotation on a column based on the columns's MS SQL type.
9999
// Make sure the column name is lowercase in the following array, regardless of how it is in the database
100100
// Column name DataAnnotation to add
101-
{ "date", "DataType(DataType.Date)" },
102-
{ "datetime", "DataType(DataType.DateTime)" },
103-
{ "datetime2", "DataType(DataType.DateTime)" },
104-
{ "datetimeoffset", "DataType(DataType.DateTime)" },
105-
{ "smallmoney", "DataType(DataType.Currency)" },
106-
{ "money", "DataType(DataType.Currency)" }
101+
{ "date", "DataType(System.ComponentModel.DataAnnotations.DataType.Date)" },
102+
{ "datetime", "DataType(System.ComponentModel.DataAnnotations.DataType.DateTime)" },
103+
{ "datetime2", "DataType(System.ComponentModel.DataAnnotations.DataType.DateTime)" },
104+
{ "datetimeoffset", "DataType(System.ComponentModel.DataAnnotations.DataType.DateTime)" },
105+
{ "smallmoney", "DataType(System.ComponentModel.DataAnnotations.DataType.Currency)" },
106+
{ "money", "DataType(System.ComponentModel.DataAnnotations.DataType.Currency)" }
107107
};
108108

109109
// Migrations *************************************************************************************************************************

0 commit comments

Comments
 (0)