Skip to content

Commit 9e6b8ed

Browse files
DelazJDelazJ
committedJul 6, 2017
Use PostGIS and PostgreSQL spelling when appropriate
·
ltr-3_40final-3_0_0
1 parent 6fab688 commit 9e6b8ed

25 files changed

+67
-67
lines changed
 

‎INSTALL

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ Optional dependencies:
116116
is not installed with rpath. The desired GRASS version is chosen on runtime by setting
117117
LD_LIBRARY_PATH or PATH.
118118
- for georeferencer - GSL >= 1.8
119-
- for postgis support - PostgreSQL >= 8.0.x
119+
- for PostGIS support - PostgreSQL >= 8.0.x
120120
- for gps plugin - gpsbabel
121121
- for mapserver export and PyQGIS - Python >= 3.3
122122
- for python support - SIP >= 4.12, PyQt >= 5.3 must match Qt version, Qscintilla2
@@ -1252,10 +1252,10 @@ http://www.kyngchaos.com/software/frameworks
12521252

12531253
Once downloaded, open and install the frameworks.
12541254

1255-
William provides an additional installer package for Postgresql (for PostGIS
1256-
support). QGIS just needs the libpq client library, so unless you want to
1255+
William provides an additional installer package for PostgreSQL (for PostGIS
1256+
support). QGIS just needs the libpq client library, so unless you want to
12571257
setup the full Postgres + PostGIS server, all you need is the client-only
1258-
package. It's available here:
1258+
package. It's available here:
12591259

12601260
http://www.kyngchaos.com/software/postgres
12611261

‎NEWS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1695,7 +1695,7 @@ Added Simon splash screen
16951695
Fixed command line loading bug to eliminate bogus warning for vector layers
16961696
Modified splashscreen.cpp to allow specification of x,y for text drawing on
16971697
the splash image
1698-
Imperfectly fixed problem where postgis attributes aren't displayed if the
1698+
Imperfectly fixed problem where PostGIS attributes aren't displayed if the
16991699
primary key is not of type int4 (bug 1042706).
17001700
Added Latvian translation file (untranslated at present)
17011701

@@ -2540,7 +2540,7 @@ Added QgsRasterLayer::filterLayer which gets called near the end of each of
25402540

25412541
2004-03-06 [didge] 0.1.0devel6
25422542
Changed configure stuff to write DEFINES in config.h.
2543-
Postgresql stuff needs testing as I commented the compileflags in src/Makefile.am
2543+
PostgreSQL stuff needs testing as I commented the compileflags in src/Makefile.am
25442544
Infos will be posted on the devel mailinglist
25452545

25462546
2004-03-04 [ts] 0.1.0devel5

‎doc/INSTALL.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ <H1>2. Overview</H1>
226226
is not installed with rpath. The desired GRASS version is chosen on runtime by setting
227227
LD_LIBRARY_PATH or PATH.
228228
<LI>for georeferencer - GSL &gt;= 1.8
229-
<LI>for postgis support - PostgreSQL &gt;= 8.0.x
229+
<LI>for PostGIS support - PostgreSQL &gt;= 8.0.x
230230
<LI>for gps plugin - gpsbabel
231231
<LI>for mapserver export and PyQGIS - Python &gt;= 3.3
232232
<LI>for python support - SIP &gt;= 4.12, PyQt &gt;= 5.3 must match Qt version, Qscintilla2
@@ -1744,10 +1744,10 @@ <H2>5.4. Install development frameworks for QGIS dependencies</H2>
17441744
Once downloaded, open and install the frameworks.
17451745
</P>
17461746
<P>
1747-
William provides an additional installer package for Postgresql (for PostGIS
1748-
support). QGIS just needs the libpq client library, so unless you want to
1747+
William provides an additional installer package for PostgreSQL (for PostGIS
1748+
support). QGIS just needs the libpq client library, so unless you want to
17491749
setup the full Postgres + PostGIS server, all you need is the client-only
1750-
package. It's available here:
1750+
package. It's available here:
17511751
</P>
17521752
<P>
17531753
<A HREF="http://www.kyngchaos.com/software/postgres">http://www.kyngchaos.com/software/postgres</A>

‎doc/news.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2865,7 +2865,7 @@ <H1>28. 0.5</H1>
28652865
<P>
28662866
2004-03-06 [didge] 0.1.0devel6
28672867
Changed configure stuff to write DEFINES in config.h.
2868-
Postgresql stuff needs testing as I commented the compileflags in src/Makefile.am
2868+
PostgreSQL stuff needs testing as I commented the compileflags in src/Makefile.am
28692869
Infos will be posted on the devel mailinglist
28702870
</P>
28712871
<P>

‎doc/news.t2t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1646,7 +1646,7 @@ Added Simon splash screen
16461646
Fixed command line loading bug to eliminate bogus warning for vector layers
16471647
Modified splashscreen.cpp to allow specification of x,y for text drawing on
16481648
the splash image
1649-
Imperfectly fixed problem where postgis attributes aren't displayed if the
1649+
Imperfectly fixed problem where PostGIS attributes aren't displayed if the
16501650
primary key is not of type int4 (bug 1042706).
16511651
Added Latvian translation file (untranslated at present)
16521652

‎doc/overview.t2t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Optional dependencies:
3636
is not installed with rpath. The desired GRASS version is chosen on runtime by setting
3737
LD_LIBRARY_PATH or PATH.
3838
- for georeferencer - GSL >= 1.8
39-
- for postgis support - PostgreSQL >= 8.0.x
39+
- for PostGIS support - PostgreSQL >= 8.0.x
4040
- for gps plugin - gpsbabel
4141
- for mapserver export and PyQGIS - Python >= 3.3
4242
- for python support - SIP >= 4.12, PyQt >= 5.3 must match Qt version, Qscintilla2

‎python/core/qgscoordinatereferencesystem.sip

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ Constructs an invalid CRS object
190190

191191
explicit QgsCoordinateReferenceSystem( const long id, CrsType type = PostgisCrsId );
192192
%Docstring
193-
Constructor a CRS object using a postgis SRID, an EPSG code or an internal QGIS CRS ID.
193+
Constructor a CRS object using a PostGIS SRID, an EPSG code or an internal QGIS CRS ID.
194194
.. note::
195195

196196
We encourage you to use EPSG code, WKT or Proj4 to describe CRS's in your code
@@ -304,7 +304,7 @@ Allows direct construction of QVariants from QgsCoordinateReferenceSystem.
304304
bool createFromSrid( const long srid );
305305
%Docstring
306306
Sets this CRS by lookup of the given PostGIS SRID in the CRS database.
307-
\param srid The postgis SRID for the desired spatial reference system.
307+
\param srid The PostGIS SRID for the desired spatial reference system.
308308
:return: True on success else false
309309
/ // TODO QGIS 3: remove unless really necessary - let's use EPSG codes instead
310310
:rtype: bool

‎python/core/qgsvectorlayer.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ class QgsVectorLayer : QgsMapLayer, QgsExpressionContextGenerator, QgsFeatureSin
8080

8181
\subsection postgres PostgreSQL data provider (postgres)
8282

83-
Connects to a postgresql database. The url defines the connection parameters, table,
83+
Connects to a PostgreSQL database. The url defines the connection parameters, table,
8484
geometry column, and other attributes. The url can be constructed using the
8585
QgsDataSourceUri class.
8686

‎python/plugins/db_manager/db_plugins/postgis/connector.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ def getInfo(self):
193193
return res
194194

195195
def getSpatialInfo(self):
196-
""" returns tuple about postgis support:
196+
""" returns tuple about PostGIS support:
197197
- lib version
198198
- geos version
199199
- proj version
@@ -732,7 +732,7 @@ def renameTable(self, table, new_table):
732732
sql = u"ALTER TABLE %s RENAME TO %s" % (self.quoteId(table), self.quoteId(new_table))
733733
self._execute(c, sql)
734734

735-
# update geometry_columns if postgis is enabled
735+
# update geometry_columns if PostGIS is enabled
736736
if self.has_geometry_columns and not self.is_geometry_columns_view:
737737
schema_where = u" AND f_table_schema=%s " % self.quoteString(schema) if schema is not None else ""
738738
sql = u"UPDATE geometry_columns SET f_table_name=%s WHERE f_table_name=%s %s" % (
@@ -751,7 +751,7 @@ def moveTableToSchema(self, table, new_schema):
751751
sql = u"ALTER TABLE %s SET SCHEMA %s" % (self.quoteId(table), self.quoteId(new_schema))
752752
self._execute(c, sql)
753753

754-
# update geometry_columns if postgis is enabled
754+
# update geometry_columns if PostGIS is enabled
755755
if self.has_geometry_columns and not self.is_geometry_columns_view:
756756
schema, tablename = self.getSchemaTableName(table)
757757
schema_where = u" AND f_table_schema=%s " % self.quoteString(schema) if schema is not None else ""
@@ -782,7 +782,7 @@ def moveTable(self, table, new_table, new_schema=None):
782782
sql = u"ALTER TABLE %s RENAME TO %s" % (self.quoteId((new_schema, t)), self.quoteId(table))
783783
self._execute(c, sql)
784784

785-
# update geometry_columns if postgis is enabled
785+
# update geometry_columns if PostGIS is enabled
786786
if self.has_geometry_columns and not self.is_geometry_columns_view:
787787
schema, tablename = self.getSchemaTableName(table)
788788
schema_where = u" f_table_schema=%s AND " % self.quoteString(schema) if schema is not None else ""
@@ -847,7 +847,7 @@ def addTableColumn(self, table, field_def):
847847
def deleteTableColumn(self, table, column):
848848
""" delete column from a table """
849849
if self.isGeometryColumn(table, column):
850-
# use postgis function to delete geometry column correctly
850+
# use PostGIS function to delete geometry column correctly
851851
schema, tablename = self.getSchemaTableName(table)
852852
schema_part = u"%s, " % self._quote_unicode(schema) if schema else ""
853853
sql = u"SELECT DropGeometryColumn(%s%s, %s)" % (
@@ -886,7 +886,7 @@ def updateTableColumn(self, table, column, new_name=None, data_type=None, not_nu
886886
self.quoteId(table), self.quoteId(column), self.quoteId(new_name))
887887
self._execute(c, sql)
888888

889-
# update geometry_columns if postgis is enabled
889+
# update geometry_columns if PostGIS is enabled
890890
if self.has_geometry_columns and not self.is_geometry_columns_view:
891891
schema, tablename = self.getSchemaTableName(table)
892892
schema_where = u" f_table_schema=%s AND " % self.quoteString(schema) if schema is not None else ""

‎python/plugins/processing/tools/postgis.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def uri_from_name(conn_name):
4949
settings.beginGroup(u"/PostgreSQL/connections/%s" % conn_name)
5050

5151
if not settings.contains("database"): # non-existent entry?
52-
raise DbError(QCoreApplication.translate("postgis", 'There is no defined database connection "{0}".').format(conn_name))
52+
raise DbError(QCoreApplication.translate("PostGIS", 'There is no defined database connection "{0}".').format(conn_name))
5353

5454
uri = QgsDataSourceUri()
5555

@@ -222,7 +222,7 @@ def __init__(self, host=None, port=None, dbname=None, user=None,
222222
password,
223223
err)
224224
if not ok:
225-
raise DbError(QCoreApplication.translate("postgis", 'Action canceled by user'))
225+
raise DbError(QCoreApplication.translate("PostGIS", 'Action canceled by user'))
226226
if user:
227227
self.uri.setUsername(user)
228228
if password:
@@ -263,7 +263,7 @@ def check_postgis(self):
263263
return c.fetchone()[0] > 0
264264

265265
def get_postgis_info(self):
266-
"""Returns tuple about postgis support:
266+
"""Returns tuple about PostGIS support:
267267
- lib version
268268
- installed scripts version
269269
- released scripts version
@@ -314,7 +314,7 @@ def list_geotables(self, schema=None):
314314
# LEFT OUTER JOIN: like LEFT JOIN but if there are more matches,
315315
# for join, all are used (not only one)
316316

317-
# First find out whether postgis is enabled
317+
# First find out whether PostGIS is enabled
318318
if not self.has_postgis:
319319
# Get all tables and views
320320
sql = """SELECT pg_class.relname, pg_namespace.nspname,
@@ -502,7 +502,7 @@ def delete_geometry_column(self, table, geom_column, schema=None):
502502
self._exec_sql_and_commit(sql)
503503

504504
def delete_geometry_table(self, table, schema=None):
505-
"""Delete table with one or more geometries using postgis function."""
505+
"""Delete table with one or more geometries using PostGIS function."""
506506

507507
if schema:
508508
schema_part = "'%s', " % self._quote_unicode(schema)
@@ -555,7 +555,7 @@ def rename_table(self, table, new_table, schema=None):
555555
self._quote(new_table))
556556
self._exec_sql_and_commit(sql)
557557

558-
# Update geometry_columns if postgis is enabled
558+
# Update geometry_columns if PostGIS is enabled
559559
if self.has_postgis:
560560
sql = "UPDATE geometry_columns SET f_table_name='%s' \
561561
WHERE f_table_name='%s'" \
@@ -598,7 +598,7 @@ def rename_schema(self, schema, new_schema):
598598
self._quote(new_schema))
599599
self._exec_sql_and_commit(sql)
600600

601-
# Update geometry_columns if postgis is enabled
601+
# Update geometry_columns if PostGIS is enabled
602602
if self.has_postgis:
603603
sql = \
604604
"UPDATE geometry_columns SET f_table_schema='%s' \
@@ -628,7 +628,7 @@ def table_column_rename(self, table, name, new_name, schema=None):
628628
self._quote(name), self._quote(new_name))
629629
self._exec_sql_and_commit(sql)
630630

631-
# Update geometry_columns if postgis is enabled
631+
# Update geometry_columns if PostGIS is enabled
632632
if self.has_postgis:
633633
sql = "UPDATE geometry_columns SET f_geometry_column='%s' \
634634
WHERE f_geometry_column='%s' AND f_table_name='%s'" \
@@ -704,7 +704,7 @@ def table_move_to_schema(self, table, new_schema, schema=None):
704704
self._quote(new_schema))
705705
self._exec_sql_and_commit(sql)
706706

707-
# Update geometry_columns if postgis is enabled
707+
# Update geometry_columns if PostGIS is enabled
708708
if self.has_postgis:
709709
sql = "UPDATE geometry_columns SET f_table_schema='%s' \
710710
WHERE f_table_name='%s'" \

‎src/core/expression/qgsexpressionfunction.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2598,7 +2598,7 @@ static QVariant fcnAzimuth( const QVariantList &values, const QgsExpressionConte
25982598
return QVariant();
25992599
}
26002600

2601-
// Code from postgis
2601+
// Code from PostGIS
26022602
if ( pt1->x() == pt2->x() )
26032603
{
26042604
if ( pt1->y() < pt2->y() )

‎src/core/geometry/qgsgeometryutils.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -642,7 +642,7 @@ void QgsGeometryUtils::segmentizeArc( const QgsPoint &p1, const QgsPoint &p2, co
642642
QgsPoint circlePoint2 = p2;
643643
QgsPoint circlePoint3 = clockwise ? p1 : p3 ;
644644

645-
//adapted code from postgis
645+
//adapted code from PostGIS
646646
double radius = 0;
647647
double centerX = 0;
648648
double centerY = 0;

‎src/core/geometry/qgswkbtypes.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class CORE_EXPORT QgsWkbTypes
7676
GeometryCollection = 7,
7777
CircularString = 8,
7878
CompoundCurve = 9,
79-
CurvePolygon = 10, //13, //should be 10. Seems to be correct in newer postgis versions
79+
CurvePolygon = 10, //13, //should be 10. Seems to be correct in newer PostGIS versions
8080
MultiCurve = 11,
8181
MultiSurface = 12,
8282
NoGeometry = 100, //attributes only

‎src/core/qgscoordinatereferencesystem.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ class CORE_EXPORT QgsCoordinateReferenceSystem
220220
*/ // TODO QGIS 3: remove "POSTGIS" and "INTERNAL", allow PROJ4 without the prefix
221221
explicit QgsCoordinateReferenceSystem( const QString &definition );
222222

223-
/** Constructor a CRS object using a postgis SRID, an EPSG code or an internal QGIS CRS ID.
223+
/** Constructor a CRS object using a PostGIS SRID, an EPSG code or an internal QGIS CRS ID.
224224
* \note We encourage you to use EPSG code, WKT or Proj4 to describe CRS's in your code
225225
* wherever possible. Internal QGIS CRS IDs are not guaranteed to be permanent / involatile.
226226
* \param id The ID valid for the chosen CRS ID type
@@ -314,7 +314,7 @@ class CORE_EXPORT QgsCoordinateReferenceSystem
314314
bool createFromOgcWmsCrs( const QString &crs );
315315

316316
/** Sets this CRS by lookup of the given PostGIS SRID in the CRS database.
317-
* \param srid The postgis SRID for the desired spatial reference system.
317+
* \param srid The PostGIS SRID for the desired spatial reference system.
318318
* \returns True on success else false
319319
*/ // TODO QGIS 3: remove unless really necessary - let's use EPSG codes instead
320320
bool createFromSrid( const long srid );
@@ -597,13 +597,13 @@ class CORE_EXPORT QgsCoordinateReferenceSystem
597597
*/
598598
static QString proj4FromSrsId( const int srsId );
599599

600-
/** Set the QGIS SrsId
600+
/** Set the QGIS SrsId
601601
* \param srsId The internal sqlite3 srs.db primary key for this CRS
602602
*/
603603
void setInternalId( long srsId );
604604

605-
/** Set the postgis srid
606-
* \param srid The postgis spatial_ref_sys key for this CRS
605+
/** Set the PostGIS srid
606+
* \param srid The PostGIS spatial_ref_sys key for this CRS
607607
*/
608608
void setSrid( long srid );
609609

‎src/core/qgscoordinatereferencesystem_p.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ class QgsCoordinateReferenceSystemPrivate : public QSharedData
105105
//! The map units for the CRS
106106
QgsUnitTypes::DistanceUnit mMapUnits;
107107

108-
//! If available, the Postgis spatial_ref_sys identifier for this CRS (defaults to 0)
108+
//! If available, the PostGIS spatial_ref_sys identifier for this CRS (defaults to 0)
109109
long mSRID;
110110

111111
//! If available the authority identifier for this CRS

‎src/core/qgsdataitem.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1114,7 +1114,7 @@ void QgsZipItem::init()
11141114
{
11151115
QString k( *i );
11161116
QgsDebugMsgLevel( "provider " + k, 3 );
1117-
// some providers hangs with empty uri (Postgis) etc...
1117+
// some providers hangs with empty uri (PostGIS) etc...
11181118
// -> using libraries directly
11191119
std::unique_ptr< QLibrary > library( QgsProviderRegistry::instance()->createProviderLibrary( k ) );
11201120
if ( library )

‎src/core/qgsvectorlayer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ typedef QSet<int> QgsAttributeIds;
136136
*
137137
* \subsection postgres PostgreSQL data provider (postgres)
138138
*
139-
* Connects to a postgresql database. The url defines the connection parameters, table,
139+
* Connects to a PostgreSQL database. The url defines the connection parameters, table,
140140
* geometry column, and other attributes. The url can be constructed using the
141141
* QgsDataSourceUri class.
142142
*

0 commit comments

Comments
 (0)
Please sign in to comment.