Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from OSGeo:master #145

Merged
merged 1 commit into from
Mar 21, 2025
Merged

[pull] master from OSGeo:master #145

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialdatasource.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1360,9 +1360,7 @@ OGRErr OGRMSSQLSpatialDataSource::InitializeMetadataTables()
CPLODBCStatement oStmt(&oSession);

oStmt.Append(
"IF NOT EXISTS (SELECT * FROM sys.objects WHERE "
"object_id = OBJECT_ID(N'[dbo].[geometry_columns]') AND type in "
"(N'U')) "
"IF OBJECT_ID(N'[geometry_columns]', N'U') IS NULL "
"CREATE TABLE geometry_columns (f_table_catalog varchar(128) not "
"null, "
"f_table_schema varchar(128) not null, f_table_name varchar(256) "
Expand All @@ -1373,9 +1371,7 @@ OGRErr OGRMSSQLSpatialDataSource::InitializeMetadataTables()
"CONSTRAINT geometry_columns_pk PRIMARY KEY (f_table_catalog, "
"f_table_schema, f_table_name, f_geometry_column));\n");

oStmt.Append("IF NOT EXISTS (SELECT * FROM sys.objects "
"WHERE object_id = OBJECT_ID(N'[dbo].[spatial_ref_sys]') "
"AND type in (N'U')) "
oStmt.Append("IF OBJECT_ID(N'[spatial_ref_sys]', N'U') IS NULL "
"CREATE TABLE spatial_ref_sys (srid integer not null "
"PRIMARY KEY, auth_name varchar(256), auth_srid integer, "
"srtext varchar(2048), proj4text varchar(2048))");
Expand Down
Loading