Skip to content

Commit 92548ec

Browse files
Merge pull request #563 from erikdarlingdata/dev
Dev
2 parents 8855b25 + 59d5df3 commit 92548ec

File tree

4 files changed

+852
-625
lines changed

4 files changed

+852
-625
lines changed

CLAUDE.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,10 +255,11 @@ This document outlines the T-SQL coding style preferences for Erik Darling (Darl
255255

256256
- **INSERT statements**:
257257
- INSERT on first line
258+
- Always use INSERT INTO
258259
- Schema and table name on next line, indented
259260
- Column list in parentheses on new lines, indented
260261
```sql
261-
INSERT
262+
INSERT INTO
262263
dbo.table_name
263264
(
264265
column1,

sp_IndexCleanup/sp_IndexCleanup.sql

Lines changed: 52 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -775,14 +775,14 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
775775
filter_definition nvarchar(max) NULL,
776776
missing_included_columns nvarchar(max) NULL,
777777
should_include_filter_columns bit NOT NULL,
778-
PRIMARY KEY CLUSTERED(database_id, schema_id, object_id, index_id)
778+
INDEX c CLUSTERED(database_id, schema_id, object_id, index_id)
779779
);
780780

781781
/* Parse @include_databases comma-separated list */
782782
IF @get_all_databases = 1
783783
AND @include_databases IS NOT NULL
784784
BEGIN
785-
INSERT
785+
INSERT INTO
786786
#include_databases
787787
WITH
788788
(TABLOCK)
@@ -825,7 +825,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
825825
IF @get_all_databases = 1
826826
AND @include_databases IS NOT NULL
827827
BEGIN
828-
INSERT
828+
INSERT INTO
829829
#requested_but_skipped_databases
830830
WITH
831831
(TABLOCK)
@@ -875,7 +875,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
875875
IF @get_all_databases = 1
876876
AND @exclude_databases IS NOT NULL
877877
BEGIN
878-
INSERT
878+
INSERT INTO
879879
#exclude_databases
880880
WITH
881881
(TABLOCK)
@@ -980,7 +980,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
980980
/* Single database mode */
981981
IF @database_name IS NOT NULL
982982
BEGIN
983-
INSERT
983+
INSERT INTO
984984
#databases
985985
WITH
986986
(TABLOCK)
@@ -1008,7 +1008,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
10081008
ELSE
10091009
BEGIN
10101010
/* Multi-database mode */
1011-
INSERT
1011+
INSERT INTO
10121012
#databases
10131013
WITH
10141014
(TABLOCK)
@@ -1109,6 +1109,12 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
11091109
#key_duplicate_dedupe;
11101110
TRUNCATE TABLE
11111111
#include_subset_dedupe;
1112+
TRUNCATE TABLE
1113+
#computed_columns_analysis;
1114+
TRUNCATE TABLE
1115+
#check_constraints_analysis;
1116+
TRUNCATE TABLE
1117+
#filtered_index_columns_analysis;
11121118

11131119
/*Validate searched objects per-database*/
11141120
IF @schema_name IS NOT NULL
@@ -1309,7 +1315,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
13091315
PRINT @sql;
13101316
END;
13111317

1312-
INSERT
1318+
INSERT INTO
13131319
#filtered_objects
13141320
WITH
13151321
(TABLOCK)
@@ -1523,23 +1529,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
15231529
@sql = N'
15241530
SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
15251531
1526-
INSERT
1527-
#computed_columns_analysis
1528-
WITH
1529-
(TABLOCK)
1530-
(
1531-
database_id,
1532-
database_name,
1533-
schema_id,
1534-
schema_name,
1535-
object_id,
1536-
table_name,
1537-
column_id,
1538-
column_name,
1539-
definition,
1540-
contains_udf,
1541-
udf_names
1542-
)
15431532
SELECT DISTINCT
15441533
fo.database_id,
15451534
fo.database_name,
@@ -1591,6 +1580,23 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
15911580
PRINT @sql;
15921581
END;
15931582

1583+
INSERT INTO
1584+
#computed_columns_analysis
1585+
WITH
1586+
(TABLOCK)
1587+
(
1588+
database_id,
1589+
database_name,
1590+
schema_id,
1591+
schema_name,
1592+
object_id,
1593+
table_name,
1594+
column_id,
1595+
column_name,
1596+
definition,
1597+
contains_udf,
1598+
udf_names
1599+
)
15941600
EXECUTE sys.sp_executesql
15951601
@sql;
15961602

@@ -1610,23 +1616,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
16101616
@sql = N'
16111617
SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
16121618
1613-
INSERT
1614-
#check_constraints_analysis
1615-
WITH
1616-
(TABLOCK)
1617-
(
1618-
database_id,
1619-
database_name,
1620-
schema_id,
1621-
schema_name,
1622-
object_id,
1623-
table_name,
1624-
constraint_id,
1625-
constraint_name,
1626-
definition,
1627-
contains_udf,
1628-
udf_names
1629-
)
16301619
SELECT DISTINCT
16311620
fo.database_id,
16321621
fo.database_name,
@@ -1675,6 +1664,23 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
16751664
PRINT @sql;
16761665
END;
16771666

1667+
INSERT INTO
1668+
#check_constraints_analysis
1669+
WITH
1670+
(TABLOCK)
1671+
(
1672+
database_id,
1673+
database_name,
1674+
schema_id,
1675+
schema_name,
1676+
object_id,
1677+
table_name,
1678+
constraint_id,
1679+
constraint_name,
1680+
definition,
1681+
contains_udf,
1682+
udf_names
1683+
)
16781684
EXECUTE sys.sp_executesql
16791685
@sql;
16801686

@@ -1773,7 +1779,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
17731779
PRINT @sql;
17741780
END;
17751781

1776-
INSERT
1782+
INSERT INTO
17771783
#operational_stats
17781784
WITH
17791785
(TABLOCK)
@@ -2031,7 +2037,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
20312037
PRINT SUBSTRING(@sql, 4000, 8000);
20322038
END;
20332039

2034-
INSERT
2040+
INSERT INTO
20352041
#index_details
20362042
WITH
20372043
(TABLOCK)
@@ -2247,7 +2253,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
22472253
PRINT SUBSTRING(@sql, 4000, 8000);
22482254
END;
22492255

2250-
INSERT
2256+
INSERT INTO
22512257
#partition_stats WITH(TABLOCK)
22522258
(
22532259
database_id,
@@ -2531,7 +2537,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
25312537
END;
25322538

25332539
/* Analyze filtered indexes to identify columns used in filters that should be included */
2534-
INSERT
2540+
INSERT INTO
25352541
#filtered_index_columns_analysis
25362542
WITH
25372543
(TABLOCK)
@@ -2548,7 +2554,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
25482554
missing_included_columns,
25492555
should_include_filter_columns
25502556
)
2551-
SELECT
2557+
SELECT DISTINCT
25522558
ia.database_id,
25532559
ia.database_name,
25542560
ia.schema_id,

0 commit comments

Comments
 (0)