HSQLDB.FUELにFIXED1を追加

Fork: 0

coverage / osmCoverage

Browse code HSQLDB.FUELにFIXED1を追加 master
1 parent 6f32b26 commit d149a8f1ae4e6987788395b9554e2469070b5124 hayashi authored on 16 Sep 2017

Patch

Unified Split

Showing 2 changed files

                Ignore Space
               Show notes
              View
            
          
          6 ■■■■■
          src/ImportGML_FUEL_update.sh
 java -cp .:osmCoverage.jar:hayashi_0225.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.fuel.DbExist
java -cp .:osmCoverage.jar:hayashi_0225.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.fuel.Fuel
java -cp .:osmCoverage.jar:hayashi_0225.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.fuel.ToPostgis
 
# java -cp hsqldb_2.2.9.jar org.hsqldb.util.DatabaseManager
#   db_driver=org.hsqldb.jdbcDriver
#   db_url=jdbc:hsqldb:file:./database/db
#   db_user=sa
#   db_passwd=
#
 java -cp .:osmCoverage.jar:hayashi_0225.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.fuel.DbExist
 java -cp .:osmCoverage.jar:hayashi_0225.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.fuel.Fuel
 java -cp .:osmCoverage.jar:hayashi_0225.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.fuel.ToPostgis
+# java -cp hsqldb_2.2.9.jar org.hsqldb.util.DatabaseManager
+#   db_driver=org.hsqldb.jdbcDriver
+#   db_url=jdbc:hsqldb:file:./database/db
+#   db_user=sa
+#   db_passwd=
+#

                Ignore Space
               Show notes
              View
            
          
          4 ■■■■■
          src/osm/jp/coverage/fuel/DbFuel.java
                 break;
            }
        }
        
        try (PreparedStatement ps = con.prepareStatement("INSERT INTO "+ TABLE_NAME +"(gid,lat,lon,fixed,idref,area,up) VALUES(0,?,?,?,?,?,2)")) {
        try (PreparedStatement ps = con.prepareStatement("INSERT INTO "+ TABLE_NAME +"(gid,lat,lon,fixed,idref,area,up,fixed1) VALUES(0,?,?,?,?,?,2,0)")) {
            double lat = Double.parseDouble(latStr);
            double lon = Double.parseDouble(lonStr);
            ps.setDouble(1, lat);
            ps.setDouble(2, lon);
            ps.setInt(3, 0);
            ps.setString(4, idStr);
            ps.setInt(5, areacode);
            System.out.println("INSERT INTO "+ TABLE_NAME +"("+ idStr +", lat="+ lat +", lon="+ lon +", fixed=0, area="+ areacode +", up=2)");
            System.out.println("INSERT INTO "+ TABLE_NAME +"("+ idStr +", lat="+ lat +", lon="+ lon +", fixed=0, area="+ areacode +", up=2, fixed1=0)");
            ps.executeUpdate();
        }
    }
                 break;
             }
         }
+        try (PreparedStatement ps = con.prepareStatement("INSERT INTO "+ TABLE_NAME +"(gid,lat,lon,fixed,idref,area,up) VALUES(0,?,?,?,?,?,2)")) {
+        try (PreparedStatement ps = con.prepareStatement("INSERT INTO "+ TABLE_NAME +"(gid,lat,lon,fixed,idref,area,up,fixed1) VALUES(0,?,?,?,?,?,2,0)")) {
             double lat = Double.parseDouble(latStr);
             double lon = Double.parseDouble(lonStr);
             ps.setDouble(1, lat);
             ps.setDouble(2, lon);
             ps.setInt(3, 0);
             ps.setString(4, idStr);
             ps.setInt(5, areacode);
+            System.out.println("INSERT INTO "+ TABLE_NAME +"("+ idStr +", lat="+ lat +", lon="+ lon +", fixed=0, area="+ areacode +", up=2)");
+            System.out.println("INSERT INTO "+ TABLE_NAME +"("+ idStr +", lat="+ lat +", lon="+ lon +", fixed=0, area="+ areacode +", up=2, fixed1=0)");
             ps.executeUpdate();
         }
     }

Show line notes below