Skip to content

Commit 7b7f8e1

Browse files
cawritescawrites
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/sql-docs-pr into updt-binding-edit
2 parents a31a308 + dec4d94 commit 7b7f8e1

11,408 files changed

Lines changed: 44041 additions & 25783 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.openpublishing.publish.config.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
],
1313
"monikers": [],
1414
"moniker_ranges": [
15-
"azuresqldb-current || azuresqldb-mi-current || azure-sqldw-latest || >= aps-pdw-2016 || >= sql-server-2016 || >= sql-server-linux-2017 || sql-server-previousversions || sqlallproducts-allversions"
15+
"azuresqldb-current || azuresqldb-mi-current || azure-sqldw-latest || >= aps-pdw-2016 || >= sql-server-2016 || >= sql-server-linux-2017 || sqlallproducts-allversions"
1616
],
1717
"open_to_public_contributors": true,
1818
"type_mapping": {

‎.openpublishing.redirection.json‎

Lines changed: 345 additions & 0 deletions
Large diffs are not rendered by default.

‎docs/ado/ado-glossary.md‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
---
2+
description: "ADO Glossary Terms"
23
title: "ADO Glossary Terms | Microsoft Docs"
34
ms.prod: sql
45
ms.prod_service: connectivity
5-
ms.technology: connectivity
6+
ms.technology: ado
67
ms.custom: ""
78
ms.date: 11/08/2018
89
ms.reviewer: ""
910
ms.topic: conceptual
1011
helpviewer_keywords:
1112
- "ADO, glossary"
1213
ms.assetid: b0478836-4123-4357-969a-c5784fc28be5
13-
author: MightyPen
14-
ms.author: genemi
14+
author: rothja
15+
ms.author: jroth
1516
---
1617
# ADO Glossary Terms
1718
This topic defines terms relevant to ADO.
@@ -171,14 +172,14 @@ This topic defines terms relevant to ADO.
171172
hierarchical Recordset
172173
A **Recordset** that contains another **Recordset**. See also data shaping, chapter.
173174

174-
For more information, see [Accessing Rows in a Hierarchical Recordset](../ado/guide/data/accessing-rows-in-a-hierarchical-recordset.md).
175+
For more information, see [Accessing Rows in a Hierarchical Recordset](./guide/data/accessing-rows-in-a-hierarchical-recordset.md).
175176

176177
hierarchy
177178
In general, a hierarchy is a ranked structure with a top level and subordinate levels. In ADO, hierarchical **Recordsets** are used to represent the parent-child relationship between a record and a chapter. Also in ADO, **Record** and **Stream** objects can be used to access hierarchical tree structures such as a folder and documents. ADO MD also includes **Hierarchy** objects to represent a relationship between the levels of a dimension in an OLAP cube. See also hierarchical Recordsets, parent-child relationship, chapter, tree.
178179

179180
## I-L
180181
ISAPI (Internet Server Application Programming Interface)
181-
A set of functions for Internet servers, such as a Windows NT® Server/Windows 2000 Server running Microsoft® Internet Information Services (IIS).
182+
A set of functions for Internet servers, such as a Windows NT® Server/Windows 2000 Server running Microsoft® Internet Information Services (IIS).
182183

183184
Key
184185
A column or columns in a table that uniquely identify a row; often used to index a table.
@@ -286,4 +287,4 @@ This topic defines terms relevant to ADO.
286287
A structure representing a hierarchical relationship between elements (nodes). There is one node at the top level of a tree (the root). Underneath the root, there can be multiple children. Each child may in turn be the parent of other children, thus branching like a tree. A folder containing documents and other folders is a typical example of a tree structure. See also hierarchy, node, root, child, parent.
287288

288289
Web server
289-
A computer that provides Web services and pages to intranet and Internet users.
290+
A computer that provides Web services and pages to intranet and Internet users.

‎docs/ado/guide/ado-history.md‎

Lines changed: 38 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
---
2+
description: "ADO Features for each Release"
23
title: "ADO History | Microsoft Docs"
34
ms.custom: ""
45
ms.date: "01/19/2019"
56
ms.reviewer: ""
67
ms.prod: sql
78
ms.prod_service: connectivity
8-
ms.technology: connectivity
9+
ms.technology: ado
910
ms.topic: conceptual
1011
helpviewer_keywords:
1112
- "ADO, what's new"
@@ -19,65 +20,65 @@ This topic lists the new features introduced by each release of ADO, ADO MD, and
1920

2021
## ADO 6.0
2122

22-
ADO 6.0 is included in Windows Vista, as a part of the Windows Data Access Components (Windows DAC) 6.0. ADO 6.0 is functionally equivalent to ADO 2.8.
23+
ADO 6.0 is included in Windows Vista, as a part of the Windows Data Access Components (Windows DAC) 6.0. ADO 6.0 is functionally equivalent to ADO 2.8.
2324

2425
## ADO 2.8
2526

26-
ADO 2.8 was included in Windows XP and Windows Server 2003, as part of the Microsoft Data Access Components (MDAC) 2.8. A redistributable version of MDAC 2.8 is also available; note that this redistributable version should only be installed on Windows 2000. ADO 2.8 addresses several security-related concerns:
27+
ADO 2.8 was included in Windows XP and Windows Server 2003, as part of the Microsoft Data Access Components (MDAC) 2.8. A redistributable version of MDAC 2.8 is also available; note that this redistributable version should only be installed on Windows 2000. ADO 2.8 addresses several security-related concerns:
2728

28-
*Hard drive access is not allowed outside a trusted zone.*
29-
In cross-domain scripting involving nontrusted sites, the following operations are disabled: **Stream.SaveToFile**, **Stream.LoadFromFile**, **Recordset.Save**, and **Recordset.Open**, used in conjunction with the **adCmdFile** flag or with the Microsoft OLE DB Persistence Provider (MSPersist).
29+
*Hard drive access is not allowed outside a trusted zone.*
30+
In cross-domain scripting involving nontrusted sites, the following operations are disabled: **Stream.SaveToFile**, **Stream.LoadFromFile**, **Recordset.Save**, and **Recordset.Open**, used in conjunction with the **adCmdFile** flag or with the Microsoft OLE DB Persistence Provider (MSPersist).
3031

31-
**Recordset.Open** _,_ **Recordset.Save** _,_ **Stream.SaveToFile** _, and_ **Stream.LoadFromFile** _operate on physical files only._
32-
These methods now verify that file handles point to physical files only.
32+
**Recordset.Open** _,_ **Recordset.Save** _,_ **Stream.SaveToFile** _, and_ **Stream.LoadFromFile** _operate on physical files only._
33+
These methods now verify that file handles point to physical files only.
3334

34-
**Recordset.ActiveCommand** _returns an error when invoked from an HTML/ASP page._
35-
This prevents the **Command** object from being misused.
35+
**Recordset.ActiveCommand** _returns an error when invoked from an HTML/ASP page._
36+
This prevents the **Command** object from being misused.
3637

37-
_The number of_ **Recordsets** _returned by a nested_ **Shape** _command has an upper bound._
38-
A nested shape command now returns a maximum of 512 **Recordsets**. This means that a **Shape** command can no longer be nested at any depth. Instead, the maximum level depth is 512, if each command results in a single (child) **Recordset**. If, at any level, a **Shape** command returns multiple **Recordsets**, the maximum level of depth will be less than 512.
38+
_The number of_ **Recordsets** _returned by a nested_ **Shape** _command has an upper bound._
39+
A nested shape command now returns a maximum of 512 **Recordsets**. This means that a **Shape** command can no longer be nested at any depth. Instead, the maximum level depth is 512, if each command results in a single (child) **Recordset**. If, at any level, a **Shape** command returns multiple **Recordsets**, the maximum level of depth will be less than 512.
3940

4041
## ADO 2.7
4142

42-
*64-bit platform support*
43-
ADO 2.7 introduces support for 64-bit processors.
43+
*64-bit platform support*
44+
ADO 2.7 introduces support for 64-bit processors.
4445

4546
## ADO 2.6
4647

47-
**CubDef.GetSchemaObject** _Method_
48-
Starting with ADO 2.6, ADO MD objects can be retrieved using unique names, as specified by the [UniqueName property (ADO MD)](../../ado/reference/ado-md-api/uniquename-property-ado-md.md). The names of parent objects do not need to be known, and parent collections do not need to be populated to retrieve a schema object. See [GetSchemaObject method (ADO MD)](../../ado/reference/ado-md-api/getschemaobject-method-ado-md.md).
48+
**CubDef.GetSchemaObject** _Method_
49+
Starting with ADO 2.6, ADO MD objects can be retrieved using unique names, as specified by the [UniqueName property (ADO MD)](../reference/ado-md-api/uniquename-property-ado-md.md). The names of parent objects do not need to be known, and parent collections do not need to be populated to retrieve a schema object. See [GetSchemaObject method (ADO MD)](../reference/ado-md-api/getschemaobject-method-ado-md.md).
4950

50-
*Command streams*
51-
The **Command** object supports commands in stream format as an alternative to using the **CommandText** property. The [CommandStream property (ADO)](../../ado/reference/ado-api/commandstream-property-ado.md) can be used to specify XML Templates or updategrams as the **Command** input with the Microsoft OLE DB Provider for SQL Server.
51+
*Command streams*
52+
The **Command** object supports commands in stream format as an alternative to using the **CommandText** property. The [CommandStream property (ADO)](../reference/ado-api/commandstream-property-ado.md) can be used to specify XML Templates or updategrams as the **Command** input with the Microsoft OLE DB Provider for SQL Server.
5253

53-
**Dialect** _property_
54-
[Dialect](../../ado/reference/ado-api/dialect-property.md) is a new property that defines the syntax and general rules that the provider uses to parse the string or stream.
54+
**Dialect** _property_
55+
[Dialect](../reference/ado-api/dialect-property.md) is a new property that defines the syntax and general rules that the provider uses to parse the string or stream.
5556

56-
**Command.Execute** _method_
57-
The [Execute method](../../ado/reference/ado-api/execute-method-ado-command.md) of the ADO **Command** object has been enhanced to use streams for input and output.
57+
**Command.Execute** _method_
58+
The [Execute method](../reference/ado-api/execute-method-ado-command.md) of the ADO **Command** object has been enhanced to use streams for input and output.
5859

59-
*Field statusvalues*
60-
If the user encounters a DB_E_ERRORSOCCURRED error when modifying a **Field** of a **Recordset**, ADO will now fill the **Field.Status** property with the appropriate status information so that the user will have more information about what went wrong. See [Status Property (ADO Field)](../../ado/reference/ado-api/status-property-ado-field.md).
60+
*Field statusvalues*
61+
If the user encounters a DB_E_ERRORSOCCURRED error when modifying a **Field** of a **Recordset**, ADO will now fill the **Field.Status** property with the appropriate status information so that the user will have more information about what went wrong. See [Status Property (ADO Field)](../reference/ado-api/status-property-ado-field.md).
6162

62-
**NamedParameters** _property_
63-
[NamedParameters](../../ado/reference/ado-api/namedparameters-property-ado.md) is a new property of the **Command** object that indicates that the provider should use named parameters.
63+
**NamedParameters** _property_
64+
[NamedParameters](../reference/ado-api/namedparameters-property-ado.md) is a new property of the **Command** object that indicates that the provider should use named parameters.
6465

65-
*Resultsets in streams*
66-
ADO can return resultsets from a data source in a **Stream**, rather than a **Recordset** object. Using the latest version of the Microsoft OLE DB Provider for SQL Server, you can get XML results from the provider by executing a "For XML" query. A **Stream** that receives the resultset can be opened with a "For XML" command as the source. See [Retrieving Resultsets into Streams](../../ado/guide/data/retrieving-resultsets-into-streams.md).
66+
*Resultsets in streams*
67+
ADO can return result sets from a data source in a **Stream**, rather than a **Recordset** object. Using the latest version of the Microsoft OLE DB Provider for SQL Server, you can get XML results from the provider by executing a "For XML" query. A **Stream** that receives the result set can be opened with a "For XML" command as the source. See [Retrieving Result sets into Streams](./data/retrieving-resultsets-into-streams.md).
6768

68-
*Single row resultset*
69-
The ADO **Record** object can now be opened on a command string or **Command** object that returns one row of data from the provider. This results in improved performance with MDAC 2.6 providers. See [Open Method (ADO Record)](../../ado/reference/ado-api/open-method-ado-record.md).
69+
*Single row resultset*
70+
The ADO **Record** object can now be opened on a command string or **Command** object that returns one row of data from the provider. This results in improved performance with MDAC 2.6 providers. See [Open Method (ADO Record)](../reference/ado-api/open-method-ado-record.md).
7071

7172
## ADO 2.5
7273

73-
**Record** _object_
74-
ADO 2.5 introduces the **Record** object to represent and manage a row from a **Recordset** or a data provider, or an object encapsulating a semi-structured data, such as a file or directory.
74+
**Record** _object_
75+
ADO 2.5 introduces the **Record** object to represent and manage a row from a **Recordset** or a data provider, or an object encapsulating a semi-structured data, such as a file or directory.
7576

76-
**Stream** _object_
77-
ADO 2.5 also introduces the **Stream** object to represent a stream of binary or text data.
77+
**Stream** _object_
78+
ADO 2.5 also introduces the *and*Stream** object to represent a stream of binary or text data.
7879

79-
*URL binding*
80-
ADO 2.5 introduces the use of a URL, as an alternative to a connection string and command text, to name data store objects. A URL can be used with the existing **Connection** and **Recordset** objects, as well as with the new **Record** and **Stream** objects.
80+
*URL binding*
81+
ADO 2.5 introduces the use of a URL, as an alternative to a connection string and command text, to name data store objects. A URL can be used with the existing **Connection** and **Recordset** objects, as well as with the new **Record** and **Stream** objects.
8182

82-
*Data providers supporting URL binding*
83-
ADO 2.5 supports OLE DB providers that recognize the URL schemes. This includes OLE DB Provider for Internet Publishing, which accesses the Windows 2000 file system and recognizes the existing HTTP scheme.
83+
*Data providers supporting URL binding*
84+
ADO 2.5 supports OLE DB providers that recognize the URL schemes. This includes OLE DB Provider for Internet Publishing, which accesses the Windows 2000 file system and recognizes the existing HTTP scheme.

‎docs/ado/guide/ado-introduction.md‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
---
2+
description: "ADO Overview and Benefits"
23
title: "ADO Introduction | Microsoft Docs"
34
ms.custom: ""
45
ms.date: "01/19/2017"
56
ms.reviewer: ""
67
ms.prod: sql
78
ms.prod_service: connectivity
8-
ms.technology: connectivity
9+
ms.technology: ado
910
ms.topic: conceptual
1011
helpviewer_keywords:
1112
- "ADO, programming"
@@ -20,14 +21,14 @@ ActiveX Data Objects (ADO) is a high-level, easy-to-use interface to OLE DB. OLE
2021

2122
This section contains the following topics.
2223

23-
- [ADO History](../../ado/guide/ado-history.md)
24+
- [ADO History](./ado-history.md)
2425

25-
- [Prerequisites for Using the ADO Documentation](../../ado/guide/prerequisites-for-using-the-ado-documentation.md)
26+
- [Prerequisites for Using the ADO Documentation](./prerequisites-for-using-the-ado-documentation.md)
2627

27-
- [Referencing the ADO Libraries](../../ado/guide/referencing-the-ado-libraries.md)
28+
- [Referencing the ADO Libraries](./referencing-the-ado-libraries.md)
2829

29-
- [ADO Task Table](../../ado/guide/ado-task-table.md)
30+
- [ADO Task Table](./ado-task-table.md)
3031

31-
- [ADO Technology Table](../../ado/guide/ado-technology-table.md)
32+
- [ADO Technology Table](./ado-technology-table.md)
3233

33-
- [ADO Security Design Issues](../../ado/guide/ado-security-design-issues.md)
34+
- [ADO Security Design Issues](./ado-security-design-issues.md)

‎docs/ado/guide/ado-programmer-s-guide.md‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
---
2+
description: "ADO Programmer's Guide for using ADO Objects"
23
title: "ADO Programmer's Guide | Microsoft Docs"
34
ms.custom: ""
45
ms.date: "01/19/2017"
56
ms.reviewer: ""
67
ms.prod: sql
78
ms.prod_service: connectivity
8-
ms.technology: connectivity
9+
ms.technology: ado
910
ms.topic: conceptual
1011
helpviewer_keywords:
1112
- "ADO, programmer's guide"
@@ -18,14 +19,14 @@ This documentation provides an overview of how to use ADO objects to work with d
1819

1920
This section contains the following topics.
2021

21-
- [Introduction](../../ado/guide/ado-introduction.md)
22+
- [Introduction](./ado-introduction.md)
2223

23-
- [ActiveX Data Objects (ADO)](../../ado/guide/data/activex-data-objects-ado.md)
24+
- [ActiveX Data Objects (ADO)](./data/ado-fundamentals.md?view=sql-server-ver15)
2425

25-
- [Remote Data Services (RDS)](../../ado/guide/remote-data-service/remote-data-service-rds.md)
26+
- [Remote Data Services (RDS)](./remote-data-service/remote-data-service-rds.md)
2627

27-
- [ADO (Multidimensional) (ADO MD)](../../ado/guide/multidimensional/ado-multidimensional-ado-md.md)
28+
- [ADO (Multidimensional) (ADO MD)](./multidimensional/ado-multidimensional-ado-md.md)
2829

29-
- [ADO Extensions for Data Definition Language and Security (ADOX)](../../ado/guide/extensions/ado-extensions-for-data-definition-language-and-security-adox.md)
30+
- [ADO Extensions for Data Definition Language and Security (ADOX)](./extensions/ado-extensions-for-data-definition-language-and-security-adox.md)
3031

31-
- [Appendixes](../../ado/guide/appendixes/ado-appendixes.md)
32+
- [Appendixes](./appendixes/appendix-a-providers.md?view=sql-server-ver15)

0 commit comments

Comments
 (0)