Skip to content

Commit 736aca3

Browse files
committed
added -c to all sql cmds
1 parent b1f1fd5 commit 736aca3

1 file changed

Lines changed: 12 additions & 5 deletions

File tree

  • samples/web-app-sql-database/python/terraform

samples/web-app-sql-database/python/terraform/deploy.sh

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,8 @@ sqlcmd -S "$SQL_SERVER_FQDN" \
124124
-d master \
125125
-U "$ADMIN_USER" \
126126
-P "$ADMIN_PASSWORD" \
127-
-Q "IF NOT EXISTS (SELECT * FROM sys.sql_logins WHERE name = '$DATABASE_USER_NAME')
127+
-C \
128+
-Q "IF NOT EXISTS (SELECT * FROM sys.sql_logins WHERE name = '$DATABASE_USER_NAME')
128129
CREATE LOGIN [$DATABASE_USER_NAME] WITH PASSWORD = '$DATABASE_USER_PASSWORD';" \
129130
-V 1
130131

@@ -141,7 +142,8 @@ sqlcmd -S "$SQL_SERVER_FQDN" \
141142
-d "$SQL_DATABASE_NAME" \
142143
-U "$ADMIN_USER" \
143144
-P "$ADMIN_PASSWORD" \
144-
-Q "IF NOT EXISTS (SELECT * FROM sys.database_principals WHERE name = '$DATABASE_USER_NAME')
145+
-C \
146+
-Q "IF NOT EXISTS (SELECT * FROM sys.database_principals WHERE name = '$DATABASE_USER_NAME')
145147
CREATE USER [$DATABASE_USER_NAME] FOR LOGIN [$DATABASE_USER_NAME];" \
146148
-V 1
147149

@@ -158,7 +160,8 @@ sqlcmd -S "$SQL_SERVER_FQDN" \
158160
-d "$SQL_DATABASE_NAME" \
159161
-U "$ADMIN_USER" \
160162
-P "$ADMIN_PASSWORD" \
161-
-Q "ALTER ROLE db_datareader ADD MEMBER [$DATABASE_USER_NAME];
163+
-C \
164+
-Q "ALTER ROLE db_datareader ADD MEMBER [$DATABASE_USER_NAME];
162165
ALTER ROLE db_datawriter ADD MEMBER [$DATABASE_USER_NAME];
163166
ALTER ROLE db_ddladmin ADD MEMBER [$DATABASE_USER_NAME];" \
164167
-V 1
@@ -176,6 +179,7 @@ sqlcmd -S "$SQL_SERVER_FQDN" \
176179
-d "$SQL_DATABASE_NAME" \
177180
-U "$DATABASE_USER_NAME" \
178181
-P "$DATABASE_USER_PASSWORD" \
182+
-C \
179183
-Q "SELECT SYSTEM_USER AS CurrentUser, DB_NAME() AS CurrentDatabase, GETDATE() AS CurrentTime;" \
180184
-V 1
181185

@@ -192,6 +196,7 @@ sqlcmd -S "$SQL_SERVER_FQDN" \
192196
-d "$SQL_DATABASE_NAME" \
193197
-U "$DATABASE_USER_NAME" \
194198
-P "$DATABASE_USER_PASSWORD" \
199+
-C \
195200
-Q "IF NOT EXISTS (SELECT * FROM sys.tables WHERE name = 'Activities' AND schema_id = SCHEMA_ID('dbo'))
196201
CREATE TABLE dbo.Activities (
197202
-- Primary Key: UNIQUEIDENTIFIER with a default of a new sequential GUID (best for indexing)
@@ -221,8 +226,9 @@ sqlcmd -S "$SQL_SERVER_FQDN" \
221226
-d "$SQL_DATABASE_NAME" \
222227
-U "$DATABASE_USER_NAME" \
223228
-P "$DATABASE_USER_PASSWORD" \
224-
-Q "INSERT INTO Activities (username, activity, timestamp)
225-
VALUES
229+
-C \
230+
-Q "INSERT INTO Activities (username, activity, timestamp)
231+
VALUES
226232
('paolo', 'Go to Paris', GETDATE()),
227233
('paolo', 'Go to London', GETDATE()),
228234
('paolo', 'Go to Mexico', GETDATE());" \
@@ -241,6 +247,7 @@ sqlcmd -S "$SQL_SERVER_FQDN" \
241247
-d "$SQL_DATABASE_NAME" \
242248
-U "$DATABASE_USER_NAME" \
243249
-P "$DATABASE_USER_PASSWORD" \
250+
-C \
244251
-Q "SELECT * FROM Activities;" \
245252
-V 1
246253

0 commit comments

Comments
 (0)