Skip to content

Commit 2f5277c

Browse files
committed
Merge branch 'carl2' of https://github.com/MashaMSFT/azure-docs-pr into carl1
2 parents 00c2817 + d172dac commit 2f5277c

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

articles/azure-sql/in-memory-oltp-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ You can always upgrade your database or instance to a higher tier, such as from
138138
But downgrading the tier can negatively impact your database. The impact is especially apparent when you downgrade from Business Critical to General Purpose (or Premium to Standard or Basic) when your database contains In-Memory OLTP objects. Memory-optimized tables are unavailable after the downgrade (even if they remain visible). The same considerations apply when you're lowering the pricing tier of an elastic pool, or moving a database with In-Memory technologies, into a General Purpose, Standard, or Basic elastic pool.
139139

140140
> [!Important]
141-
> In-Memory OLTP isn't supported in the General Purpose, Standard or Basic tier. Therefore, it isn't possible to move a database that has any In-Memory OLTP objects to the one of these tiers.
141+
> In-Memory OLTP isn't supported in the General Purpose, Standard or Basic tier. Therefore, it isn't possible to move a database that has any In-Memory OLTP objects to one of these tiers.
142142
143143
Before you downgrade the database to General Purpose, Standard, or Basic, remove all memory-optimized tables and table types, as well as all natively compiled T-SQL modules.
144144

articles/azure-sql/multi-model-features.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,9 @@ Document models can be used instead of the relational models in some specific sc
9090
Spatial data represents information about the physical location and shape of geometric objects. These objects can be point locations or more complex objects such as countries/regions, roads, or lakes.
9191

9292
The Azure SQL family of services let you parse and query data represented in JavaScript Object Notation [(JSON)](https://www.json.org/) format, and export your relational data as JSON text.
93-
support two spatial data types - the geometry data type and the geography data type.
93+
94+
95+
The two supported two spatial data types:
9496

9597
- The geometry type represents data in a Euclidean (flat) coordinate system.
9698
- The geography type represents data in a round-earth coordinate system.

0 commit comments

Comments
 (0)