use postgis as an extension for versions >= 2.0

[nominatim.git] / utils / setup.php

diff --git a/utils/setup.php b/utils/setup.php
index 22c5a533ef76845915be248f59feb226c7e06d51..fb16254dba4066acad970d3e93a763b75d598c2f 100755 (executable)
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -26,6 +26,7 @@
                array('create-tables', '', 0, 1, 0, 0, 'bool', 'Create main tables'),
                array('create-partition-tables', '', 0, 1, 0, 0, 'bool', 'Create required partition tables'),
                array('create-partition-functions', '', 0, 1, 0, 0, 'bool', 'Create required partition triggers'),
                array('create-tables', '', 0, 1, 0, 0, 'bool', 'Create main tables'),
                array('create-partition-tables', '', 0, 1, 0, 0, 'bool', 'Create required partition tables'),
                array('create-partition-functions', '', 0, 1, 0, 0, 'bool', 'Create required partition triggers'),

+               array('no-partitions', '', 0, 1, 0, 0, 'bool', "Do not partition search indices (speeds up import of single country extracts)"),

                array('import-wikipedia-articles', '', 0, 1, 0, 0, 'bool', 'Import wikipedia article dump'),
                array('load-data', '', 0, 1, 0, 0, 'bool', 'Copy data to live tables from import table'),
                array('disable-token-precalc', '', 0, 1, 0, 0, 'bool', 'Disable name precalculation (EXPERT)'),
                array('import-wikipedia-articles', '', 0, 1, 0, 0, 'bool', 'Import wikipedia article dump'),
                array('load-data', '', 0, 1, 0, 0, 'bool', 'Copy data to live tables from import table'),
                array('disable-token-precalc', '', 0, 1, 0, 0, 'bool', 'Disable name precalculation (EXPERT)'),


@@ -124,7 +125,13 @@
                        pgsqlRunScript('CREATE EXTENSION hstore');
                }
 
                        pgsqlRunScript('CREATE EXTENSION hstore');
                }
 

-               pgsqlRunScriptFile(CONST_Path_Postgresql_Postgis.'/postgis.sql');
+               $fPostgisVersion = (float) CONST_Postgis_Version;
+               if ($fPostgisVersion < 2.0) {
+                       pgsqlRunScriptFile(CONST_Path_Postgresql_Postgis.'/postgis.sql');
+                       pgsqlRunScriptFile(CONST_Path_Postgresql_Postgis.'/spatial_ref_sys.sql');
+               } else {
+                       pgsqlRunScript('CREATE EXTENSION postgis');
+               }

                $sVersionString = $oDB->getOne('select postgis_full_version()');
                preg_match('#POSTGIS="([0-9]+)[.]([0-9]+)[.]([0-9]+)( r([0-9]+))?"#', $sVersionString, $aMatches);
                if (CONST_Postgis_Version != $aMatches[1].'.'.$aMatches[2])
                $sVersionString = $oDB->getOne('select postgis_full_version()');
                preg_match('#POSTGIS="([0-9]+)[.]([0-9]+)[.]([0-9]+)( r([0-9]+))?"#', $sVersionString, $aMatches);
                if (CONST_Postgis_Version != $aMatches[1].'.'.$aMatches[2])


@@ -133,7 +140,6 @@
                        exit;
                }
 
                        exit;
                }
 

-               pgsqlRunScriptFile(CONST_Path_Postgresql_Postgis.'/spatial_ref_sys.sql');

                pgsqlRunScriptFile(CONST_BasePath.'/data/country_name.sql');
                pgsqlRunScriptFile(CONST_BasePath.'/data/country_naturalearthdata.sql');
                pgsqlRunScriptFile(CONST_BasePath.'/data/country_osm_grid.sql');
                pgsqlRunScriptFile(CONST_BasePath.'/data/country_name.sql');
                pgsqlRunScriptFile(CONST_BasePath.'/data/country_naturalearthdata.sql');
                pgsqlRunScriptFile(CONST_BasePath.'/data/country_osm_grid.sql');


@@ -141,6 +147,11 @@
                pgsqlRunScriptFile(CONST_BasePath.'/data/us_statecounty.sql');
                pgsqlRunScriptFile(CONST_BasePath.'/data/us_state.sql');
                pgsqlRunScriptFile(CONST_BasePath.'/data/us_postcode.sql');
                pgsqlRunScriptFile(CONST_BasePath.'/data/us_statecounty.sql');
                pgsqlRunScriptFile(CONST_BasePath.'/data/us_state.sql');
                pgsqlRunScriptFile(CONST_BasePath.'/data/us_postcode.sql');

+
+               if ($aCMDResult['no-partitions'])
+               {
+                       pgsqlRunScript('update country_name set partition = 0');
+               }

        }
 
        if ($aCMDResult['import-data'] || $aCMDResult['all'])
        }
 
        if ($aCMDResult['import-data'] || $aCMDResult['all'])


@@ -232,13 +243,13 @@
                echo "Partition Tables\n";
                $bDidSomething = true;
                $oDB =& getDB();
                echo "Partition Tables\n";
                $bDidSomething = true;
                $oDB =& getDB();

-               $sSQL = 'select partition from country_name order by country_code';
+               $sSQL = 'select distinct partition from country_name';

                $aPartitions = $oDB->getCol($sSQL);
                if (PEAR::isError($aPartitions))
                {
                        fail($aPartitions->getMessage());
                }
                $aPartitions = $oDB->getCol($sSQL);
                if (PEAR::isError($aPartitions))
                {
                        fail($aPartitions->getMessage());
                }

-               $aPartitions[] = 0;
+               if (!$aCMDResult['no-partitions']) $aPartitions[] = 0;

 
                $sTemplate = file_get_contents(CONST_BasePath.'/sql/partition-tables.src.sql');
                preg_match_all('#^-- start(.*?)^-- end#ms', $sTemplate, $aMatches, PREG_SET_ORDER);
 
                $sTemplate = file_get_contents(CONST_BasePath.'/sql/partition-tables.src.sql');
                preg_match_all('#^-- start(.*?)^-- end#ms', $sTemplate, $aMatches, PREG_SET_ORDER);


@@ -261,13 +272,13 @@
                echo "Partition Functions\n";
                $bDidSomething = true;
                $oDB =& getDB();
                echo "Partition Functions\n";
                $bDidSomething = true;
                $oDB =& getDB();

-               $sSQL = 'select partition from country_name order by country_code';
+               $sSQL = 'select distinct partition from country_name';

                $aPartitions = $oDB->getCol($sSQL);
                if (PEAR::isError($aPartitions))
                {
                        fail($aPartitions->getMessage());
                }
                $aPartitions = $oDB->getCol($sSQL);
                if (PEAR::isError($aPartitions))
                {
                        fail($aPartitions->getMessage());
                }

-               $aPartitions[] = 0;
+               if (!$aCMDResult['no-partitions']) $aPartitions[] = 0;

 
                $sTemplate = file_get_contents(CONST_BasePath.'/sql/partition-functions.src.sql');
                preg_match_all('#^-- start(.*?)^-- end#ms', $sTemplate, $aMatches, PREG_SET_ORDER);
 
                $sTemplate = file_get_contents(CONST_BasePath.'/sql/partition-functions.src.sql');
                preg_match_all('#^-- start(.*?)^-- end#ms', $sTemplate, $aMatches, PREG_SET_ORDER);


@@ -337,13 +348,13 @@
                if (!pg_query($oDB->connection, 'CREATE SEQUENCE seq_place start 100000')) fail(pg_last_error($oDB->connection));
                echo '.';
 
                if (!pg_query($oDB->connection, 'CREATE SEQUENCE seq_place start 100000')) fail(pg_last_error($oDB->connection));
                echo '.';
 

-               $sSQL = 'select partition from country_name order by country_code';
+               $sSQL = 'select distinct partition from country_name';

                $aPartitions = $oDB->getCol($sSQL);
                if (PEAR::isError($aPartitions))
                {
                        fail($aPartitions->getMessage());
                }
                $aPartitions = $oDB->getCol($sSQL);
                if (PEAR::isError($aPartitions))
                {
                        fail($aPartitions->getMessage());
                }

-               $aPartitions[] = 0;
+               if (!$aCMDResult['no-partitions']) $aPartitions[] = 0;

                foreach($aPartitions as $sPartition)
                {
                        if (!pg_query($oDB->connection, 'TRUNCATE location_road_'.$sPartition)) fail(pg_last_error($oDB->connection));
                foreach($aPartitions as $sPartition)
                {
                        if (!pg_query($oDB->connection, 'TRUNCATE location_road_'.$sPartition)) fail(pg_last_error($oDB->connection));


@@ -596,13 +607,13 @@
                echo "Search indices\n";
                $bDidSomething = true;
                $oDB =& getDB();
                echo "Search indices\n";
                $bDidSomething = true;
                $oDB =& getDB();

-               $sSQL = 'select partition from country_name order by country_code';
+               $sSQL = 'select distinct partition from country_name';

                $aPartitions = $oDB->getCol($sSQL);
                if (PEAR::isError($aPartitions))
                {
                        fail($aPartitions->getMessage());
                }
                $aPartitions = $oDB->getCol($sSQL);
                if (PEAR::isError($aPartitions))
                {
                        fail($aPartitions->getMessage());
                }

-               $aPartitions[] = 0;
+               if (!$aCMDResult['no-partitions']) $aPartitions[] = 0;

 
                $sTemplate = file_get_contents(CONST_BasePath.'/sql/indices.src.sql');
                preg_match_all('#^-- start(.*?)^-- end#ms', $sTemplate, $aMatches, PREG_SET_ORDER);
 
                $sTemplate = file_get_contents(CONST_BasePath.'/sql/indices.src.sql');
                preg_match_all('#^-- start(.*?)^-- end#ms', $sTemplate, $aMatches, PREG_SET_ORDER);