Merge pull request #54 from migurski/remove-apidb-nearby-column

Removed reference to users.nearby column
openstreetmap · Mar 8, 2020 · 4732a7e · 4732a7e
2 parents 9cfb8a0 + fecbd8f
commit 4732a7e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/osmosis-apidb/src/main/java/org/openstreetmap/osmosis/apidb/v0_6/impl/UserManager.java b/osmosis-apidb/src/main/java/org/openstreetmap/osmosis/apidb/v0_6/impl/UserManager.java
@@ -25,8 +25,8 @@ public class UserManager implements Closeable {
 
     private static final String INSERT_SQL_USER = "INSERT INTO users (id, email, pass_crypt,"
             + " creation_time, display_name, data_public, description, home_lat, home_lon, home_zoom,"
-            + " nearby, pass_salt) VALUES (?, ?, '00000000000000000000000000000000', NOW(), ?, ?,"
-            + " ?, 0, 0, 3, 50, '00000000')";
+            + " pass_salt) VALUES (?, ?, '00000000000000000000000000000000', NOW(), ?, ?,"
+            + " ?, 0, 0, 3, '00000000')";
 
     private static final String UPDATE_SQL_USER = "UPDATE users SET display_name = ? WHERE id = ?";
 

diff --git a/package/script/contrib/apidb_0.6.sql b/package/script/contrib/apidb_0.6.sql
@@ -2756,7 +2756,6 @@ CREATE TABLE users (
     home_lat double precision,
     home_lon double precision,
     home_zoom smallint DEFAULT 3,
-    nearby integer DEFAULT 50,
     pass_salt character varying(255),
     image text,
     email_valid boolean DEFAULT false NOT NULL,