diff --git a/src/Tests/Tests.Schema.verified.md b/src/Tests/Tests.Schema.verified.md index 4882018..07b8853 100644 --- a/src/Tests/Tests.Schema.verified.md +++ b/src/Tests/Tests.Schema.verified.md @@ -179,6 +179,19 @@ CREATE TABLE [dbo].[ParentTable]( ) ON [PRIMARY] ``` +### SchemaTable + +```sql +CREATE TABLE [TestSchema].[SchemaTable]( + [Id] [int] IDENTITY(1,1) NOT NULL, + [Name] [nvarchar](50) NOT NULL, + CONSTRAINT [PK_SchemaTable] PRIMARY KEY CLUSTERED +( + [Id] ASC +) ON [PRIMARY] +) ON [PRIMARY] +``` + ### WithComputed ```sql @@ -212,19 +225,6 @@ CREATE TABLE [dbo].[WithDefaults]( ) ON [PRIMARY] ``` -### SchemaTable - -```sql -CREATE TABLE [TestSchema].[SchemaTable]( - [Id] [int] IDENTITY(1,1) NOT NULL, - [Name] [nvarchar](50) NOT NULL, - CONSTRAINT [PK_SchemaTable] PRIMARY KEY CLUSTERED -( - [Id] ASC -) ON [PRIMARY] -) ON [PRIMARY] -``` - ## Views ### MyView @@ -384,20 +384,20 @@ END; ## Synonyms -### synonym1 +### SchemaSynonym ```sql -CREATE SYNONYM [dbo].[synonym1] FOR [MyTable] +CREATE SYNONYM [TestSchema].[SchemaSynonym] FOR [TestSchema].[SchemaTable] ``` -### synonym2 +### synonym1 ```sql -CREATE SYNONYM [dbo].[synonym2] FOR [ParentTable] +CREATE SYNONYM [dbo].[synonym1] FOR [MyTable] ``` -### SchemaSynonym +### synonym2 ```sql -CREATE SYNONYM [TestSchema].[SchemaSynonym] FOR [TestSchema].[SchemaTable] +CREATE SYNONYM [dbo].[synonym2] FOR [ParentTable] ``` diff --git a/src/Tests/Tests.SchemaAsMarkdown.verified.md b/src/Tests/Tests.SchemaAsMarkdown.verified.md index 4882018..07b8853 100644 --- a/src/Tests/Tests.SchemaAsMarkdown.verified.md +++ b/src/Tests/Tests.SchemaAsMarkdown.verified.md @@ -179,6 +179,19 @@ CREATE TABLE [dbo].[ParentTable]( ) ON [PRIMARY] ``` +### SchemaTable + +```sql +CREATE TABLE [TestSchema].[SchemaTable]( + [Id] [int] IDENTITY(1,1) NOT NULL, + [Name] [nvarchar](50) NOT NULL, + CONSTRAINT [PK_SchemaTable] PRIMARY KEY CLUSTERED +( + [Id] ASC +) ON [PRIMARY] +) ON [PRIMARY] +``` + ### WithComputed ```sql @@ -212,19 +225,6 @@ CREATE TABLE [dbo].[WithDefaults]( ) ON [PRIMARY] ``` -### SchemaTable - -```sql -CREATE TABLE [TestSchema].[SchemaTable]( - [Id] [int] IDENTITY(1,1) NOT NULL, - [Name] [nvarchar](50) NOT NULL, - CONSTRAINT [PK_SchemaTable] PRIMARY KEY CLUSTERED -( - [Id] ASC -) ON [PRIMARY] -) ON [PRIMARY] -``` - ## Views ### MyView @@ -384,20 +384,20 @@ END; ## Synonyms -### synonym1 +### SchemaSynonym ```sql -CREATE SYNONYM [dbo].[synonym1] FOR [MyTable] +CREATE SYNONYM [TestSchema].[SchemaSynonym] FOR [TestSchema].[SchemaTable] ``` -### synonym2 +### synonym1 ```sql -CREATE SYNONYM [dbo].[synonym2] FOR [ParentTable] +CREATE SYNONYM [dbo].[synonym1] FOR [MyTable] ``` -### SchemaSynonym +### synonym2 ```sql -CREATE SYNONYM [TestSchema].[SchemaSynonym] FOR [TestSchema].[SchemaTable] +CREATE SYNONYM [dbo].[synonym2] FOR [ParentTable] ``` diff --git a/src/Tests/Tests.SchemaAsSql.verified.sql b/src/Tests/Tests.SchemaAsSql.verified.sql index fbff5ae..42267ab 100644 --- a/src/Tests/Tests.SchemaAsSql.verified.sql +++ b/src/Tests/Tests.SchemaAsSql.verified.sql @@ -147,6 +147,15 @@ CREATE TABLE [dbo].[ParentTable]( ) ON [PRIMARY] ) ON [PRIMARY] +CREATE TABLE [TestSchema].[SchemaTable]( + [Id] [int] IDENTITY(1,1) NOT NULL, + [Name] [nvarchar](50) NOT NULL, + CONSTRAINT [PK_SchemaTable] PRIMARY KEY CLUSTERED +( + [Id] ASC +) ON [PRIMARY] +) ON [PRIMARY] + CREATE TABLE [dbo].[WithComputed]( [Id] [int] IDENTITY(1,1) NOT NULL, [FirstName] [nvarchar](50) NOT NULL, @@ -172,15 +181,6 @@ CREATE TABLE [dbo].[WithDefaults]( ) ON [PRIMARY] ) ON [PRIMARY] -CREATE TABLE [TestSchema].[SchemaTable]( - [Id] [int] IDENTITY(1,1) NOT NULL, - [Name] [nvarchar](50) NOT NULL, - CONSTRAINT [PK_SchemaTable] PRIMARY KEY CLUSTERED -( - [Id] ASC -) ON [PRIMARY] -) ON [PRIMARY] - -- Views CREATE VIEW MyView @@ -292,8 +292,8 @@ END; -- Synonyms -CREATE SYNONYM [dbo].[synonym1] FOR [MyTable] +CREATE SYNONYM [TestSchema].[SchemaSynonym] FOR [TestSchema].[SchemaTable] -CREATE SYNONYM [dbo].[synonym2] FOR [ParentTable] +CREATE SYNONYM [dbo].[synonym1] FOR [MyTable] -CREATE SYNONYM [TestSchema].[SchemaSynonym] FOR [TestSchema].[SchemaTable] \ No newline at end of file +CREATE SYNONYM [dbo].[synonym2] FOR [ParentTable] \ No newline at end of file diff --git a/src/Tests/Tests.SchemaFilter.verified.md b/src/Tests/Tests.SchemaFilter.verified.md index f73f7ca..21ed239 100644 --- a/src/Tests/Tests.SchemaFilter.verified.md +++ b/src/Tests/Tests.SchemaFilter.verified.md @@ -179,6 +179,19 @@ CREATE TABLE [dbo].[ParentTable]( ) ON [PRIMARY] ``` +### SchemaTable + +```sql +CREATE TABLE [TestSchema].[SchemaTable]( + [Id] [int] IDENTITY(1,1) NOT NULL, + [Name] [nvarchar](50) NOT NULL, + CONSTRAINT [PK_SchemaTable] PRIMARY KEY CLUSTERED +( + [Id] ASC +) ON [PRIMARY] +) ON [PRIMARY] +``` + ### WithComputed ```sql @@ -212,19 +225,6 @@ CREATE TABLE [dbo].[WithDefaults]( ) ON [PRIMARY] ``` -### SchemaTable - -```sql -CREATE TABLE [TestSchema].[SchemaTable]( - [Id] [int] IDENTITY(1,1) NOT NULL, - [Name] [nvarchar](50) NOT NULL, - CONSTRAINT [PK_SchemaTable] PRIMARY KEY CLUSTERED -( - [Id] ASC -) ON [PRIMARY] -) ON [PRIMARY] -``` - ## Views ### MyView diff --git a/src/Tests/Tests.SchemaInDynamic.verified.txt b/src/Tests/Tests.SchemaInDynamic.verified.txt index 229ba3b..b1d4ac9 100644 --- a/src/Tests/Tests.SchemaInDynamic.verified.txt +++ b/src/Tests/Tests.SchemaInDynamic.verified.txt @@ -181,6 +181,19 @@ CREATE TABLE [dbo].[ParentTable]( ) ON [PRIMARY] ``` +### SchemaTable + +```sql +CREATE TABLE [TestSchema].[SchemaTable]( + [Id] [int] IDENTITY(1,1) NOT NULL, + [Name] [nvarchar](50) NOT NULL, + CONSTRAINT [PK_SchemaTable] PRIMARY KEY CLUSTERED +( + [Id] ASC +) ON [PRIMARY] +) ON [PRIMARY] +``` + ### WithComputed ```sql @@ -214,19 +227,6 @@ CREATE TABLE [dbo].[WithDefaults]( ) ON [PRIMARY] ``` -### SchemaTable - -```sql -CREATE TABLE [TestSchema].[SchemaTable]( - [Id] [int] IDENTITY(1,1) NOT NULL, - [Name] [nvarchar](50) NOT NULL, - CONSTRAINT [PK_SchemaTable] PRIMARY KEY CLUSTERED -( - [Id] ASC -) ON [PRIMARY] -) ON [PRIMARY] -``` - ## Views ### MyView @@ -386,21 +386,21 @@ END; ## Synonyms -### synonym1 +### SchemaSynonym ```sql -CREATE SYNONYM [dbo].[synonym1] FOR [MyTable] +CREATE SYNONYM [TestSchema].[SchemaSynonym] FOR [TestSchema].[SchemaTable] ``` -### synonym2 +### synonym1 ```sql -CREATE SYNONYM [dbo].[synonym2] FOR [ParentTable] +CREATE SYNONYM [dbo].[synonym1] FOR [MyTable] ``` -### SchemaSynonym +### synonym2 ```sql -CREATE SYNONYM [TestSchema].[SchemaSynonym] FOR [TestSchema].[SchemaTable] +CREATE SYNONYM [dbo].[synonym2] FOR [ParentTable] ``` } \ No newline at end of file diff --git a/src/Tests/Tests.SchemaInclude.verified.md b/src/Tests/Tests.SchemaInclude.verified.md index f73f7ca..21ed239 100644 --- a/src/Tests/Tests.SchemaInclude.verified.md +++ b/src/Tests/Tests.SchemaInclude.verified.md @@ -179,6 +179,19 @@ CREATE TABLE [dbo].[ParentTable]( ) ON [PRIMARY] ``` +### SchemaTable + +```sql +CREATE TABLE [TestSchema].[SchemaTable]( + [Id] [int] IDENTITY(1,1) NOT NULL, + [Name] [nvarchar](50) NOT NULL, + CONSTRAINT [PK_SchemaTable] PRIMARY KEY CLUSTERED +( + [Id] ASC +) ON [PRIMARY] +) ON [PRIMARY] +``` + ### WithComputed ```sql @@ -212,19 +225,6 @@ CREATE TABLE [dbo].[WithDefaults]( ) ON [PRIMARY] ``` -### SchemaTable - -```sql -CREATE TABLE [TestSchema].[SchemaTable]( - [Id] [int] IDENTITY(1,1) NOT NULL, - [Name] [nvarchar](50) NOT NULL, - CONSTRAINT [PK_SchemaTable] PRIMARY KEY CLUSTERED -( - [Id] ASC -) ON [PRIMARY] -) ON [PRIMARY] -``` - ## Views ### MyView diff --git a/src/Tests/Tests.SchemaIncludeAll.verified.md b/src/Tests/Tests.SchemaIncludeAll.verified.md index 4882018..07b8853 100644 --- a/src/Tests/Tests.SchemaIncludeAll.verified.md +++ b/src/Tests/Tests.SchemaIncludeAll.verified.md @@ -179,6 +179,19 @@ CREATE TABLE [dbo].[ParentTable]( ) ON [PRIMARY] ``` +### SchemaTable + +```sql +CREATE TABLE [TestSchema].[SchemaTable]( + [Id] [int] IDENTITY(1,1) NOT NULL, + [Name] [nvarchar](50) NOT NULL, + CONSTRAINT [PK_SchemaTable] PRIMARY KEY CLUSTERED +( + [Id] ASC +) ON [PRIMARY] +) ON [PRIMARY] +``` + ### WithComputed ```sql @@ -212,19 +225,6 @@ CREATE TABLE [dbo].[WithDefaults]( ) ON [PRIMARY] ``` -### SchemaTable - -```sql -CREATE TABLE [TestSchema].[SchemaTable]( - [Id] [int] IDENTITY(1,1) NOT NULL, - [Name] [nvarchar](50) NOT NULL, - CONSTRAINT [PK_SchemaTable] PRIMARY KEY CLUSTERED -( - [Id] ASC -) ON [PRIMARY] -) ON [PRIMARY] -``` - ## Views ### MyView @@ -384,20 +384,20 @@ END; ## Synonyms -### synonym1 +### SchemaSynonym ```sql -CREATE SYNONYM [dbo].[synonym1] FOR [MyTable] +CREATE SYNONYM [TestSchema].[SchemaSynonym] FOR [TestSchema].[SchemaTable] ``` -### synonym2 +### synonym1 ```sql -CREATE SYNONYM [dbo].[synonym2] FOR [ParentTable] +CREATE SYNONYM [dbo].[synonym1] FOR [MyTable] ``` -### SchemaSynonym +### synonym2 ```sql -CREATE SYNONYM [TestSchema].[SchemaSynonym] FOR [TestSchema].[SchemaTable] +CREATE SYNONYM [dbo].[synonym2] FOR [ParentTable] ``` diff --git a/src/Tests/Tests.SchemaIncludeSynonymsOnly.verified.md b/src/Tests/Tests.SchemaIncludeSynonymsOnly.verified.md index e057653..9021c8e 100644 --- a/src/Tests/Tests.SchemaIncludeSynonymsOnly.verified.md +++ b/src/Tests/Tests.SchemaIncludeSynonymsOnly.verified.md @@ -1,19 +1,19 @@ ## Synonyms -### synonym1 +### SchemaSynonym ```sql -CREATE SYNONYM [dbo].[synonym1] FOR [MyTable] +CREATE SYNONYM [TestSchema].[SchemaSynonym] FOR [TestSchema].[SchemaTable] ``` -### synonym2 +### synonym1 ```sql -CREATE SYNONYM [dbo].[synonym2] FOR [ParentTable] +CREATE SYNONYM [dbo].[synonym1] FOR [MyTable] ``` -### SchemaSynonym +### synonym2 ```sql -CREATE SYNONYM [TestSchema].[SchemaSynonym] FOR [TestSchema].[SchemaTable] +CREATE SYNONYM [dbo].[synonym2] FOR [ParentTable] ``` diff --git a/src/Tests/Tests.SchemaIncludeTablesOnly.verified.md b/src/Tests/Tests.SchemaIncludeTablesOnly.verified.md index 068caae..c02d145 100644 --- a/src/Tests/Tests.SchemaIncludeTablesOnly.verified.md +++ b/src/Tests/Tests.SchemaIncludeTablesOnly.verified.md @@ -179,6 +179,19 @@ CREATE TABLE [dbo].[ParentTable]( ) ON [PRIMARY] ``` +### SchemaTable + +```sql +CREATE TABLE [TestSchema].[SchemaTable]( + [Id] [int] IDENTITY(1,1) NOT NULL, + [Name] [nvarchar](50) NOT NULL, + CONSTRAINT [PK_SchemaTable] PRIMARY KEY CLUSTERED +( + [Id] ASC +) ON [PRIMARY] +) ON [PRIMARY] +``` + ### WithComputed ```sql @@ -211,16 +224,3 @@ CREATE TABLE [dbo].[WithDefaults]( ) ON [PRIMARY] ) ON [PRIMARY] ``` - -### SchemaTable - -```sql -CREATE TABLE [TestSchema].[SchemaTable]( - [Id] [int] IDENTITY(1,1) NOT NULL, - [Name] [nvarchar](50) NOT NULL, - CONSTRAINT [PK_SchemaTable] PRIMARY KEY CLUSTERED -( - [Id] ASC -) ON [PRIMARY] -) ON [PRIMARY] -``` diff --git a/src/Verify.SqlServer/SchemaValidation/SqlScriptBuilder.cs b/src/Verify.SqlServer/SchemaValidation/SqlScriptBuilder.cs index 64e30bf..1e2053e 100644 --- a/src/Verify.SqlServer/SchemaValidation/SqlScriptBuilder.cs +++ b/src/Verify.SqlServer/SchemaValidation/SqlScriptBuilder.cs @@ -129,6 +129,7 @@ void AppendType(StringBuilder builder, ScriptingOptions options, IEnumerable< { var filtered = items .Where(_ => !isSystem(_) && settings.IncludeItem(_)) + .OrderBy(_ => _.Name, StringComparer.Ordinal) .ToList(); if (filtered.Count == 0) {