Merge pull request #144 from cyberious/master

(MODULES-2464) Simplify query for sp_configure check

Author: ferventcoder

spec/defines/sp_configure_spec.rb

@@ -18,9 +18,8 @@
         'RECONFIGURE'
     ] }
     let(:should_contain_onlyif) { [
-        "INSERT INTO @sp_conf EXECUTE sp_configure @configname = N'filestream access level'",
-        "IF EXISTS(select * from @sp_conf where name = 'filestream access level' AND run_value != 1)
-	THROW 51000, 'sp_configure `filestream access level` is not in the correct state', 10"
+        "IF EXISTS(SELECT * FROM sys.configurations WHERE name = 'filestream access level' AND value_in_use != 1)",
+        "THROW 51000, 'sp_configure `filestream access level` is not in the correct state', 10"
     ] }
     it_behaves_like 'sqlserver_tsql command'
     it_behaves_like 'sqlserver_tsql onlyif'

templates/query/sp_configure.sql.erb

@@ -1,12 +1,3 @@
 USE master;
-DECLARE @sp_conf TABLE
-(
- name nvarchar(35),
- minimum int,
- maximum int,
- config_value int,
- run_value int
-)
-INSERT INTO @sp_conf EXECUTE sp_configure @configname = N'<%= @config_name %>'
-IF EXISTS(select * from @sp_conf where name = '<%= @config_name %>' AND run_value != <%= @value %>)
+IF EXISTS(SELECT * FROM sys.configurations WHERE name = '<%= @config_name %>' AND value_in_use != <%= @value %>)
 	THROW 51000, 'sp_configure `<%= @config_name %>` is not in the correct state', 10