Fixed bug with login exists, and creation

Author: Travis Fields

templates/create/login.sql.erb

@@ -8,7 +8,7 @@ BEGIN
     ELSE				ALTER LOGIN [<%= @login %>] DISABLE
 
 	ALTER LOGIN [<%= @login %>] WITH
-	<% if @type != 'WINDOWS_LOGIN' -%>
+	<% if @login_type != 'WINDOWS_LOGIN' -%>
 		CHECK_EXPIRATION = <% if @check_expiration %>ON<% else %>OFF<% end %>,
 		CHECK_POLICY	 = <% if @check_policy %>ON<% else %>OFF<% end %>,
 	<% end -%>
@@ -29,7 +29,7 @@ END
 ELSE
 BEGIN
 	CREATE LOGIN [<%= @login %>]
-	 <% if @type != 'WINDOWS_LOGIN' -%>
+	 <% if @login_type !~ /WINDOWS_LOGIN/i -%>
 	  WITH
 		PASSWORD = '<%= @password %>',
 		CHECK_EXPIRATION = <% if @check_expiration %>ON<% else %>OFF<% end %>,

templates/query/login_exists.sql.erb

@@ -29,7 +29,13 @@ IF NOT EXISTS(
         ) THROW 51000, 'ERROR: the login is not in the correct state', 10
     /* If it does exist check for each role is in the correct state */
     <% @svrroles.each do |role, enable_bit| %>
-        IF IS_SRVROLEMEMBER('<%= role %>','<%= @login %>') != <%= enable_bit %> THROW 51000, 'ERROR: a role is not correct for <%= role %>', 10
+        IF (SELECT COUNT(me.role_principal_id) from sys.server_role_members me
+          JOIN sys.server_principals rol ON me.role_principal_id = rol.principal_id
+          JOIN sys.server_principals pri ON me.member_principal_id = pri.principal_id
+          WHERE rol.type_desc = 'SERVER_ROLE'
+            AND rol.name = '<%= role %>'
+            AND pri.name = '<%= @login %>') != <%= enable_bit %>
+          THROW 51000, 'ERROR: a role is not correct for <%= role %>', 10
     <% end %>
 
 <% end %>