Skip to content
This repository was archived by the owner on Dec 24, 2022. It is now read-only.

Commit 503d189

Browse files
mythzmythz
committed
rename to IsUniqueIndex and IsUniqueContraint
1 parent 04e2cc5 commit 503d189

File tree

11 files changed

+30
-20
lines changed

11 files changed

+30
-20
lines changed

‎src/ServiceStack.OrmLite.Firebird/FirebirdOrmLiteDialectProvider.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ public override string GetColumnDefinition(FieldDefinition fieldDef)
385385
{
386386
sql.Append(" NOT NULL");
387387
}
388-
if (fieldDef.UniqueConstraint)
388+
if (fieldDef.IsUniqueConstraint)
389389
{
390390
sql.Append(" UNIQUE");
391391
}
@@ -403,10 +403,10 @@ public override List<string> ToCreateIndexStatements(Type tableType)
403403
if (!fieldDef.IsIndexed) continue;
404404

405405
var indexName = GetIndexName(
406-
fieldDef.IsUnique, modelDef.ModelName, fieldDef.FieldName);
406+
fieldDef.IsUniqueIndex, modelDef.ModelName, fieldDef.FieldName);
407407

408408
sqlIndexes.Add(
409-
ToCreateIndexStatement(fieldDef.IsUnique, indexName, modelDef, fieldDef.FieldName, false));
409+
ToCreateIndexStatement(fieldDef.IsUniqueIndex, indexName, modelDef, fieldDef.FieldName, false));
410410
}
411411

412412
foreach (var compositeIndex in modelDef.CompositeIndexes)

‎src/ServiceStack.OrmLite.Oracle/OracleOrmLiteDialectProvider.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,7 @@ public override string GetColumnDefinition(FieldDefinition fieldDef)
615615

616616
sql.Append(fieldDef.IsNullable ? " NULL" : " NOT NULL");
617617

618-
if (fieldDef.UniqueConstraint)
618+
if (fieldDef.IsUniqueConstraint)
619619
{
620620
sql.Append(" UNIQUE");
621621
}
@@ -634,15 +634,15 @@ public override List<string> ToCreateIndexStatements(Type tableType)
634634
if (!fieldDef.IsIndexed) continue;
635635

636636
var indexName = GetIndexName(
637-
fieldDef.IsUnique,
637+
fieldDef.IsUniqueIndex,
638638
(modelDef.IsInSchema
639639
? modelDef.Schema + "_" + modelDef.ModelName
640640
: modelDef.ModelName).SafeVarName(),
641641
fieldDef.FieldName);
642642
indexName = NamingStrategy.ApplyNameRestrictions(indexName);
643643

644644
sqlIndexes.Add(
645-
ToCreateIndexStatement(fieldDef.IsUnique, indexName, modelDef, fieldDef.FieldName));
645+
ToCreateIndexStatement(fieldDef.IsUniqueIndex, indexName, modelDef, fieldDef.FieldName));
646646
}
647647

648648
foreach (var compositeIndex in modelDef.CompositeIndexes)

‎src/ServiceStack.OrmLite.PostgreSQL/PostgreSQLDialectProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ public override string GetColumnDefinition(FieldDefinition fieldDef)
206206
}
207207
}
208208

209-
if (fieldDef.UniqueConstraint)
209+
if (fieldDef.IsUniqueConstraint)
210210
{
211211
sql.Append(" UNIQUE");
212212
}

‎src/ServiceStack.OrmLite.SqlServer/SqlServer2012OrmLiteDialectProvider.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,11 @@ public override string GetColumnDefinition(FieldDefinition fieldDef)
130130
sql.Append(fieldDef.IsNullable ? " NULL" : " NOT NULL");
131131
}
132132

133+
if (fieldDef.IsUniqueConstraint)
134+
{
135+
sql.Append(" UNIQUE");
136+
}
137+
133138
var defaultValue = GetDefaultValue(fieldDef);
134139
if (!string.IsNullOrEmpty(defaultValue))
135140
{

‎src/ServiceStack.OrmLite.SqlServer/SqlServer2014OrmLiteDialectProvider.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public override string GetColumnDefinition(FieldDefinition fieldDef)
5959
sql.Append($" HASH WITH (BUCKET_COUNT = {bucketCount.Value})");
6060
}
6161
}
62-
else if (!isMemoryTable && fieldDef.IsUnique)
62+
else if (!isMemoryTable && fieldDef.IsUniqueIndex)
6363
{
6464
sql.Append(" UNIQUE");
6565

@@ -85,6 +85,11 @@ public override string GetColumnDefinition(FieldDefinition fieldDef)
8585
}
8686
}
8787

88+
if (fieldDef.IsUniqueConstraint)
89+
{
90+
sql.Append(" UNIQUE");
91+
}
92+
8893
var defaultValue = GetDefaultValue(fieldDef);
8994
if (!string.IsNullOrEmpty(defaultValue))
9095
{

‎src/ServiceStack.OrmLite.SqlServer/SqlServerOrmLiteDialectProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ public override string GetColumnDefinition(FieldDefinition fieldDef)
228228
sql.Append(fieldDef.IsNullable ? " NULL" : " NOT NULL");
229229
}
230230

231-
if (fieldDef.UniqueConstraint)
231+
if (fieldDef.IsUniqueConstraint)
232232
{
233233
sql.Append(" UNIQUE");
234234
}

‎src/ServiceStack.OrmLite.VistaDB/VistaDbDialectProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ public override string GetColumnDefinition(FieldDefinition fieldDef)
175175
sql.Append(" NOT NULL");
176176
}
177177

178-
if (fieldDef.UniqueConstraint)
178+
if (fieldDef.IsUniqueConstraint)
179179
{
180180
sql.Append(" UNIQUE");
181181
}

‎src/ServiceStack.OrmLite/FieldDefinition.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public class FieldDefinition
4040

4141
public bool IsIndexed { get; set; }
4242

43-
public bool IsUnique { get; set; }
43+
public bool IsUniqueIndex { get; set; }
4444

4545
public bool IsClustered { get; set; }
4646

@@ -56,7 +56,7 @@ public class FieldDefinition
5656

5757
public string CheckConstraint { get; set; }
5858

59-
public bool UniqueConstraint { get; set; }
59+
public bool IsUniqueConstraint { get; set; }
6060

6161
public ForeignKeyConstraint ForeignKey { get; set; }
6262

@@ -138,15 +138,15 @@ public FieldDefinition Clone(Action<FieldDefinition> modifier = null)
138138
AutoIncrement = AutoIncrement,
139139
IsNullable = IsNullable,
140140
IsIndexed = IsIndexed,
141-
IsUnique = IsUnique,
141+
IsUniqueIndex = IsUniqueIndex,
142142
IsClustered = IsClustered,
143143
IsNonClustered = IsNonClustered,
144144
IsRowVersion = IsRowVersion,
145145
FieldLength = FieldLength,
146146
Scale = Scale,
147147
DefaultValue = DefaultValue,
148148
CheckConstraint = CheckConstraint,
149-
UniqueConstraint = UniqueConstraint,
149+
IsUniqueConstraint = IsUniqueConstraint,
150150
ForeignKey = ForeignKey,
151151
GetValueFn = GetValueFn,
152152
SetValueFn = SetValueFn,

‎src/ServiceStack.OrmLite/OrmLiteConfigExtensions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ internal static ModelDefinition GetModelDefinition(this Type modelType)
143143
isPrimaryKey &&
144144
propertyInfo.HasAttribute<AutoIncrementAttribute>(),
145145
IsIndexed = !isPrimaryKey && isIndex,
146-
IsUnique = isUnique,
146+
IsUniqueIndex = isUnique,
147147
IsClustered = indexAttr != null && indexAttr.Clustered,
148148
IsNonClustered = indexAttr != null && indexAttr.NonClustered,
149149
IsRowVersion = isRowVersion,
@@ -153,7 +153,7 @@ internal static ModelDefinition GetModelDefinition(this Type modelType)
153153
FieldLength = stringLengthAttr?.MaximumLength,
154154
DefaultValue = defaultValueAttr?.DefaultValue,
155155
CheckConstraint = chkConstraintAttr?.Constraint,
156-
UniqueConstraint = propertyInfo.HasAttribute<UniqueAttribute>(),
156+
IsUniqueConstraint = propertyInfo.HasAttribute<UniqueAttribute>(),
157157
ForeignKey = fkAttr == null
158158
? referencesAttr != null ? new ForeignKeyConstraint(referencesAttr.Type) : null
159159
: new ForeignKeyConstraint(fkAttr.Type, fkAttr.OnDelete, fkAttr.OnUpdate, fkAttr.ForeignKeyName),

‎src/ServiceStack.OrmLite/OrmLiteDialectProviderBase.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@ public virtual string GetColumnDefinition(FieldDefinition fieldDef)
414414
sql.Append(fieldDef.IsNullable ? " NULL" : " NOT NULL");
415415
}
416416

417-
if (fieldDef.UniqueConstraint)
417+
if (fieldDef.IsUniqueConstraint)
418418
{
419419
sql.Append(" UNIQUE");
420420
}
@@ -1269,10 +1269,10 @@ public virtual List<string> ToCreateIndexStatements(Type tableType)
12691269
{
12701270
if (!fieldDef.IsIndexed) continue;
12711271

1272-
var indexName = GetIndexName(fieldDef.IsUnique, modelDef.ModelName.SafeVarName(), fieldDef.FieldName);
1272+
var indexName = GetIndexName(fieldDef.IsUniqueIndex, modelDef.ModelName.SafeVarName(), fieldDef.FieldName);
12731273

12741274
sqlIndexes.Add(
1275-
ToCreateIndexStatement(fieldDef.IsUnique, indexName, modelDef, fieldDef.FieldName, isCombined: false, fieldDef: fieldDef));
1275+
ToCreateIndexStatement(fieldDef.IsUniqueIndex, indexName, modelDef, fieldDef.FieldName, isCombined: false, fieldDef: fieldDef));
12761276
}
12771277

12781278
foreach (var compositeIndex in modelDef.CompositeIndexes)

0 commit comments

Comments
 (0)