Conflict on identical object schema

A SQL Server Management Studio add-in to source control your database in Subversion or Team Foundation Server.

Moderators: Chris Auckland, David Atkinson, sherr, PhilScrace

Conflict on identical object schema

Postby DarrenGuy » Fri Nov 25, 2011 4:33 pm

Using ver 2.2

I have the following scenaria. I have two tables that are identical, but the column order of the two tables is different

eg.

CREATE TABLE [dbo].[Suppliers](
[Id] [uniqueidentifier] ROWGUIDCOL NOT NULL,
[TenantId] [uniqueidentifier] NOT NULL,
[SupplierTypeId] [uniqueidentifier] NOT NULL,
[Status] [int] NOT NULL,
[SupplierStatus] [int] NOT NULL,
[Code] [nvarchar](20) NOT NULL,
[Name] [nvarchar](50) NOT NULL
)

CREATE TABLE [dbo].[Suppliers](
[Id] [uniqueidentifier] ROWGUIDCOL NOT NULL,
[TenantId] [uniqueidentifier] NOT NULL,
[SupplierTypeId] [uniqueidentifier] NOT NULL,
[Status] [int] NOT NULL,
[Code] [nvarchar](20) NOT NULL,
[Name] [nvarchar](50) NOT NULL,
[SupplierStatus] [int] NOT NULL
)

The only difference between the structure of the two objects is the location of the SupplierStatus field

However in SQL Source Control, when pulling the latest changes from my Kiln repository it is reporting a conflict.

Use SQL Compare, it is reporting that this object between two databases are identical.

Is there a way within SQL Source Control to indicate that this type of conflict is not actually a conflict at all and can be safely ignored
DarrenGuy
 
Posts: 5
Joined: Fri Sep 09, 2011 6:08 pm

Postby james.billings » Fri Nov 25, 2011 5:12 pm

Thanks for posting.

It looks like originally, SQL Source Control would have indeed ignored column order differences, but quite a lot of people wanted it to pick these up. It was altered in 2.1 to see this as a change (see here)

Unfortunately this wasn't done as a configurable option so I don't think there's currently any easy way of changing it back.
james.billings
 
Posts: 1144
Joined: Wed Jun 16, 2010 11:10 am
Location: My desk.


Return to SQL Source Control 2

Who is online

Users browsing this forum: No registered users and 0 guests