Skip to content

Commit 1b3ef1a

Browse files
sanderstadsanderstad
committed
Removed unneccesary code. Fixes #14 
1 parent 47b91e7 commit 1b3ef1a

1 file changed

Lines changed: 75 additions & 146 deletions

File tree

‎internal/scripts/database.sql‎

Lines changed: 75 additions & 146 deletions
Original file line numberDiff line numberDiff line change
@@ -1,136 +1,93 @@
1-
SET NUMERIC_ROUNDABORT OFF
2-
GO
3-
SET ANSI_PADDING, ANSI_WARNINGS, CONCAT_NULL_YIELDS_NULL, ARITHABORT, QUOTED_IDENTIFIER, ANSI_NULLS ON
4-
GO
5-
SET XACT_ABORT ON
6-
GO
7-
SET TRANSACTION ISOLATION LEVEL Serializable
8-
GO
9-
BEGIN TRANSACTION
10-
GO
11-
IF @@ERROR <> 0 SET NOEXEC ON
12-
GO
13-
PRINT N'Creating [dbo].[Clone]'
14-
GO
1+
152
CREATE TABLE [dbo].[Clone]
163
(
17-
[CloneID] [int] NOT NULL IDENTITY(1, 1),
18-
[ImageID] [int] NOT NULL,
19-
[HostID] [int] NOT NULL,
20-
[CloneLocation] [varchar] (255) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
21-
[AccessPath] [varchar] (255) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
22-
[SqlInstance] [varchar] (50) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
23-
[DatabaseName] [varchar] (100) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
24-
[IsEnabled] [bit] NOT NULL CONSTRAINT [DF_Clone_IsEnabled] DEFAULT ((1))
4+
[CloneID] [INT] NOT NULL IDENTITY(1, 1)
5+
,[ImageID] [INT] NOT NULL
6+
,[HostID] [INT] NOT NULL
7+
,[CloneLocation] [VARCHAR] (255) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL
8+
,[AccessPath] [VARCHAR] (255) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL
9+
,[SqlInstance] [VARCHAR] (50) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL
10+
,[DatabaseName] [VARCHAR] (100) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL
11+
,[IsEnabled] [BIT] NOT NULL CONSTRAINT [DF_Clone_IsEnabled] DEFAULT ((1))
2512
)
2613
GO
27-
IF @@ERROR <> 0 SET NOEXEC ON
28-
GO
29-
PRINT N'Creating primary key [PK__Clone] on [dbo].[Clone]'
30-
GO
31-
ALTER TABLE [dbo].[Clone] ADD CONSTRAINT [PK__Clone] PRIMARY KEY CLUSTERED ([CloneID])
32-
GO
33-
IF @@ERROR <> 0 SET NOEXEC ON
34-
GO
35-
PRINT N'Creating [dbo].[Clone_GetAll]'
36-
GO
14+
3715
CREATE PROCEDURE [dbo].[Clone_GetAll]
3816
AS
3917
BEGIN
4018
SET NOCOUNT ON;
4119

42-
SELECT CloneID,
43-
ImageID,
44-
HostID,
45-
CloneLocation,
46-
AccessPath,
47-
SqlInstance,
48-
DatabaseName,
49-
IsEnabled
50-
FROM dbo.Clone;
20+
SELECT
21+
CloneID
22+
,ImageID
23+
,HostID
24+
,CloneLocation
25+
,AccessPath
26+
,SqlInstance
27+
,DatabaseName
28+
,IsEnabled
29+
FROM
30+
dbo.Clone;
5131
END;
5232

5333
GO
54-
IF @@ERROR <> 0 SET NOEXEC ON
55-
GO
56-
PRINT N'Creating [dbo].[Image]'
57-
GO
34+
5835
CREATE TABLE [dbo].[Image]
5936
(
60-
[ImageID] [int] NOT NULL IDENTITY(1, 1),
61-
[ImageName] [varchar] (100) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
62-
[ImageLocation] [varchar] (255) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
63-
[SizeMB] [int] NOT NULL,
64-
[DatabaseName] [varchar] (100) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
65-
[DatabaseTimestamp] [datetime] NOT NULL,
66-
[CreatedOn] [datetime] NOT NULL
37+
[ImageID] [INT] NOT NULL IDENTITY(1, 1)
38+
,[ImageName] [VARCHAR] (100) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL
39+
,[ImageLocation] [VARCHAR] (255) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL
40+
,[SizeMB] [INT] NOT NULL
41+
,[DatabaseName] [VARCHAR] (100) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL
42+
,[DatabaseTimestamp] [DATETIME] NOT NULL
43+
,[CreatedOn] [DATETIME] NOT NULL
6744
)
6845
GO
69-
IF @@ERROR <> 0 SET NOEXEC ON
70-
GO
71-
PRINT N'Creating primary key [PK_Image] on [dbo].[Image]'
72-
GO
73-
ALTER TABLE [dbo].[Image] ADD CONSTRAINT [PK_Image] PRIMARY KEY CLUSTERED ([ImageID])
74-
GO
75-
IF @@ERROR <> 0 SET NOEXEC ON
76-
GO
77-
PRINT N'Creating [dbo].[Image_GetAll]'
78-
GO
46+
7947
CREATE PROCEDURE [dbo].[Image_GetAll]
8048
AS
8149
BEGIN
8250
SET NOCOUNT ON;
8351

84-
SELECT ImageID,
85-
ImageName,
86-
ImageLocation,
87-
SizeMB,
88-
DatabaseName,
89-
DatabaseTimestamp,
90-
CreatedOn
91-
FROM dbo.Image;
52+
SELECT
53+
ImageID
54+
,ImageName
55+
,ImageLocation
56+
,SizeMB
57+
,DatabaseName
58+
,DatabaseTimestamp
59+
,CreatedOn
60+
FROM
61+
dbo.Image;
9262
END;
9363

9464
GO
95-
IF @@ERROR <> 0 SET NOEXEC ON
96-
GO
97-
PRINT N'Creating [dbo].[Host]'
98-
GO
65+
9966
CREATE TABLE [dbo].[Host]
10067
(
101-
[HostID] [int] NOT NULL IDENTITY(1, 1),
102-
[HostName] [varchar] (100) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
103-
[IPAddress] [varchar] (20) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
104-
[FQDN] [varchar] (255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL
68+
[HostID] [INT] NOT NULL IDENTITY(1, 1)
69+
,[HostName] [VARCHAR] (100) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL
70+
,[IPAddress] [VARCHAR] (20) COLLATE SQL_Latin1_General_CP1_CI_AS NULL
71+
,[FQDN] [VARCHAR] (255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL
10572
)
10673
GO
107-
IF @@ERROR <> 0 SET NOEXEC ON
108-
GO
109-
PRINT N'Creating primary key [PK__Host] on [dbo].[Host]'
110-
GO
111-
ALTER TABLE [dbo].[Host] ADD CONSTRAINT [PK__Host] PRIMARY KEY CLUSTERED ([HostID])
112-
GO
113-
IF @@ERROR <> 0 SET NOEXEC ON
114-
GO
115-
PRINT N'Creating [dbo].[Host_GetAll]'
116-
GO
74+
11775
CREATE PROCEDURE [dbo].[Host_GetAll]
11876
AS
11977
BEGIN
12078
SET NOCOUNT ON;
12179

122-
SELECT HostID,
123-
HostName,
124-
IPAddress,
125-
FQDN
126-
FROM dbo.Host;
80+
SELECT
81+
HostID
82+
,HostName
83+
,IPAddress
84+
,FQDN
85+
FROM
86+
dbo.Host;
12787
END;
12888

12989
GO
130-
IF @@ERROR <> 0 SET NOEXEC ON
131-
GO
132-
PRINT N'Creating [dbo].[Clone_New]'
133-
GO
90+
13491
/*
13592
Description:
13693
Procedure for adding a new clone
@@ -141,14 +98,14 @@ Date Who Notes
14198
2018-06-20 Sander Stad Initial procedure
14299
*/
143100
CREATE PROCEDURE [dbo].[Clone_New]
144-
@CloneID INT OUTPUT,
145-
@ImageID INT,
146-
@HostID INT,
147-
@CloneLocation VARCHAR(255),
148-
@AccessPath VARCHAR(255),
149-
@SqlInstance VARCHAR(50),
150-
@DatabaseName VARCHAR(100),
151-
@IsEnabled BIT = 1
101+
@CloneID INT OUTPUT
102+
,@ImageID INT
103+
,@HostID INT
104+
,@CloneLocation VARCHAR(255)
105+
,@AccessPath VARCHAR(255)
106+
,@SqlInstance VARCHAR(50)
107+
,@DatabaseName VARCHAR(100)
108+
,@IsEnabled BIT = 1
152109
AS
153110
BEGIN
154111

@@ -213,10 +170,7 @@ BEGIN
213170

214171
END;
215172
GO
216-
IF @@ERROR <> 0 SET NOEXEC ON
217-
GO
218-
PRINT N'Creating [dbo].[Host_New]'
219-
GO
173+
220174
/*
221175
Description:
222176
Procedure for adding a new host
@@ -227,10 +181,10 @@ Date Who Notes
227181
2018-06-20 Sander Stad Initial procedure
228182
*/
229183
CREATE PROCEDURE [dbo].[Host_New]
230-
@HostID INT OUTPUT,
231-
@HostName VARCHAR(100),
232-
@IPAddress VARCHAR(20),
233-
@FQDN VARCHAR(255)
184+
@HostID INT OUTPUT
185+
,@HostName VARCHAR(100)
186+
,@IPAddress VARCHAR(20)
187+
,@FQDN VARCHAR(255)
234188
AS
235189
BEGIN
236190

@@ -277,10 +231,7 @@ BEGIN
277231

278232
END;
279233
GO
280-
IF @@ERROR <> 0 SET NOEXEC ON
281-
GO
282-
PRINT N'Creating [dbo].[Image_New]'
283-
GO
234+
284235
/*
285236
Description:
286237
Procedure for adding a new image
@@ -291,12 +242,12 @@ Date Who Notes
291242
2018-06-20 Sander Stad Initial procedure
292243
*/
293244
CREATE PROCEDURE [dbo].[Image_New]
294-
@ImageID INT OUTPUT,
295-
@ImageName VARCHAR(100),
296-
@ImageLocation VARCHAR(255),
297-
@SizeMB INT,
298-
@DatabaseName VARCHAR(100),
299-
@DatabaseTimestamp DATETIME
245+
@ImageID INT OUTPUT
246+
,@ImageName VARCHAR(100)
247+
,@ImageLocation VARCHAR(255)
248+
,@SizeMB INT
249+
,@DatabaseName VARCHAR(100)
250+
,@DatabaseTimestamp DATETIME
300251
AS
301252
BEGIN
302253

@@ -355,26 +306,4 @@ BEGIN
355306

356307
END;
357308
GO
358-
IF @@ERROR <> 0 SET NOEXEC ON
359-
GO
360-
PRINT N'Adding foreign keys to [dbo].[Clone]'
361-
GO
362-
ALTER TABLE [dbo].[Clone] ADD CONSTRAINT [FK_Clone_Image] FOREIGN KEY ([ImageID]) REFERENCES [dbo].[Image] ([ImageID])
363-
GO
364-
ALTER TABLE [dbo].[Clone] ADD CONSTRAINT [FK_Clone_Host] FOREIGN KEY ([HostID]) REFERENCES [dbo].[Host] ([HostID])
365-
GO
366-
IF @@ERROR <> 0 SET NOEXEC ON
367-
GO
368-
COMMIT TRANSACTION
369-
GO
370-
IF @@ERROR <> 0 SET NOEXEC ON
371-
GO
372-
DECLARE @Success AS BIT
373-
SET @Success = 1
374-
SET NOEXEC OFF
375-
IF (@Success = 1) PRINT 'The database update succeeded'
376-
ELSE BEGIN
377-
IF @@TRANCOUNT > 0 ROLLBACK TRANSACTION
378-
PRINT 'The database update failed'
379-
END
380-
GO
309+

0 commit comments

Comments
 (0)