Skip to content

Commit f20b430

Browse files
committed
Merge pull request #129 from cyberious/Docs-1.1.0
(docs) Several docs updates
2 parents 11f2e69 + c1debc3 commit f20b430

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

README.md

+6-2
Original file line numberDiff line numberDiff line change
@@ -248,9 +248,13 @@ For more information about installer switches and configuring SQL Server, see th
248248

249249
Executes a TSQL query against a SQL Server instance.
250250

251+
Requires the `sqlserver::config` define for access to the parent instance.
252+
251253
* `command`: *Optional.* Supplies a TSQL statement to execute. Valid options: a string.
252254

253-
* `instance`: *Required.* Specifies the SQL Server instance on which to execute the statement. Valid options: a string containing the name of an existing instance. Default: 'MSSQLSERVER'.
255+
* `instance`: *Required.* Specifies the SQL Server instance on which to execute the statement. Valid options: a string containing the name of an existing instance. Default: 'MSSQLSERVER'.
256+
257+
* `database`: *Optional* Specifies the default database to connect to. Default: 'master'
254258

255259
* `onlyif`: *Optional.* Supplies a TSQL statement to execute before running the `command` statement, determining whether to move forward. If the `onlyif` statement ends with a THROW or any non-standard exit, Puppet executes the `command` statement. Valid options: a string.
256260

@@ -306,7 +310,7 @@ Requires the `sqlserver::config` define for access to the parent instance.
306310

307311
* `log_filegrowth`: *Optional.* Specifies the automatic growth increment of the log file. Cannot be specified if `os_file_name` is set to a UNC path. Does not apply to a FILESTREAM filegroup. This parameter is set at creation only; it is not affected by updates. Valid options: a number with an optional suffix of 'KB', 'MB', 'GB', or 'TB', no greater than the value of `log_maxsize`. If you do not include a suffix, SQL Server assumes the number is in megabytes. Default: undef.
308312

309-
* `log_filename`: *Required if `log_name` is specified.* Specifies the operating system (physical) name of the log file. This parameter is set at creation only; it is not affected by updates. Valid options: a string. Default: undef.
313+
* `log_filename`: *Required if `log_name` is specified.* Specifies the operating system (physical) name of the log file. This parameter is set at creation only; it is not affected by updates. Valid options: a string containing an absolute path. Default: undef.
310314

311315
* `log_maxsize`: *Optional.* Specifies the maximum size to which the log file can grow. Cannot be specified if `os_file_name` is set to a UNC path. This parameter is set at creation only; it is not affected by updates. Valid options: a number, no greater than 2147483647, with an optional suffix of 'KB', 'MB', 'GB', or 'TB'. If you do not include a suffix, SQL Server assumes the number is in megabytes. Default: undef.
312316

lib/puppet/type/sqlserver_tsql.rb

+4-3
Original file line numberDiff line numberDiff line change
@@ -16,27 +16,28 @@ def self.checks
1616
@checks.keys
1717
end
1818

19-
desc 'command to run against an instance with the authenticated credentials used in sqlserver::config'
2019
newparam(:command, :parent => Puppet::Property::SqlserverTsql) do
20+
desc 'command to run against an instance with the authenticated credentials used in sqlserver::config'
2121

2222
end
2323

24-
desc 'requires the usage of sqlserver::config with the user and password'
2524
newparam(:instance) do
25+
desc 'requires the usage of sqlserver::config with the user and password'
2626
munge do |value|
2727
value.upcase
2828
end
2929
end
3030

3131
newparam(:database) do
32+
desc 'initial database to connect to during query execution'
3233
defaultto 'master'
3334
validate do |value|
3435
fail("Invalid database name #{value}") unless /^[[:word:]|#|@]+/.match(value)
3536
end
3637
end
3738

38-
desc 'SQL Query to run and only run if exits with non-zero'
3939
newcheck(:onlyif, :parent => Puppet::Property::SqlserverTsql) do
40+
desc 'SQL Query to run and only run if exits with non-zero'
4041
#Runs in the event that our TSQL exits with anything other than 0
4142
def check(value)
4243
output = provider.run(value)

0 commit comments

Comments
 (0)