Revision 46047 trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.h2spatial/org.gvsig.h2spatial.h2gis132/org.gvsig.h2spatial.h2gis132.provider/src/main/java/org/gvsig/fmap/dal/store/h2/H2SpatialHelper.java

View differences:

H2SpatialHelper.java
38 38 
import org.gvsig.fmap.dal.resource.exception.AccessResourceException;
39 39 
import org.gvsig.fmap.dal.spi.DataServerExplorerProviderServices;
40 40 
import static org.gvsig.fmap.dal.store.h2.H2SpatialHelper.LOGGER;
41 
import org.gvsig.fmap.dal.store.h2.functions.Json_value;
42 
import org.gvsig.fmap.dal.store.h2.functions.Reverse;
43 
import org.gvsig.fmap.dal.store.h2.functions.Reverseinstr;
41 44 
import org.gvsig.fmap.dal.store.h2.operations.H2SpatialOperationsFactory;
42 45 
import org.gvsig.fmap.dal.store.jdbc.JDBCConnectionParameters;
43 46 
import org.gvsig.fmap.dal.store.jdbc.JDBCNewStoreParameters;
......
162 165 
            } catch(SQLException ex) {
163 166 
                H2GISFunctions.load(conn);
164 167 
            }
165 
            try {
166 
                conn.createStatement().execute("CREATE SCHEMA IF NOT EXISTS PUBLIC;SET SCHEMA PUBLIC");
167 
            } catch(SQLException ex) {
168 
                LOGGER.trace("Can't create schema public.",ex);
169 
                // Ignore this error.
168 

  		




  
  169
  
    
            String[] sqls = new String[] {


  		




  
  170
  
    
                "CREATE SCHEMA IF NOT EXISTS PUBLIC;SET SCHEMA PUBLIC",


  		




  
  171
  
    
                Json_value.getSQL(),


  		




  
  172
  
    
                Reverse.getSQL(),


  		




  
  173
  
    
                Reverseinstr.getSQL()


  		




  
  174
  
    
            };


  		




  
  175
  
    
            for (String sql : sqls) {


  		




  
  176
  
    
                try {


  		




  
  177
  
    
                    conn.createStatement().execute(sql);


  		




  
  178
  
    
                } catch(SQLException ex) {


  		




  
  179
  
    
                    LOGGER.debug("Can't configure gvsig tables.",ex);


  		




  
  180
  
    
                    LOGGER.warn("Can't configure gvsig tables. "+sql);


  		




  
  181
  
    
                    // Ignore this error.


  		




  
  182
  
    
                }


  		




  170
  183
  
    
            }


  		




  171
  184
  
    
            


  		




  172
  185
  
    
            if( newdb ) {


  		




  173
  
  
    
                    String[] sqls = new String[] {


  		




  
  186
  
    
                    String[] sqls2 = new String[] {


  		




  174
  187
  
    
                        "CREATE CACHED TABLE PUBLIC.\""+TABLE_RESOURCES_NAME+"\"(\""+FIELD_RESOURCES_NAME+"\" VARCHAR(150) NOT NULL, \""+FIELD_RESOURCES_RESOURCE+"\" BLOB DEFAULT NULL)",


  		




  175
  188
  
    
                        "ALTER TABLE PUBLIC.\""+TABLE_RESOURCES_NAME+"\" ADD CONSTRAINT PUBLIC.CONSTRAINT_E PRIMARY KEY(\""+FIELD_RESOURCES_NAME+"\")",


  		




  176
  189
  
    
                        "CREATE CACHED TABLE PUBLIC.\""+TABLE_CONFIGURATION_NAME+"\"(\""+FIELD_CONFIGURATION_NAME+"\" VARCHAR(200) NOT NULL, \""+FIELD_CONFIGURATION_VALUE+"\" CLOB DEFAULT NULL)",


  		




  177
  
  
    
                        "ALTER TABLE PUBLIC.\""+TABLE_CONFIGURATION_NAME+"\" ADD CONSTRAINT PUBLIC.CONSTRAINT_2 PRIMARY KEY(\""+FIELD_CONFIGURATION_NAME+"\")"


  		




  
  190
  
    
                        "ALTER TABLE PUBLIC.\""+TABLE_CONFIGURATION_NAME+"\" ADD CONSTRAINT PUBLIC.CONSTRAINT_2 PRIMARY KEY(\""+FIELD_CONFIGURATION_NAME+"\")",


  		




  178
  191
  
    
                    };


  		




  179
  
  
    
                    for (String sql : sqls) {


  		




  
  192
  
    
                    for (String sql : sqls2) {


  		




  180
  193
  
    
                        try {


  		




  181
  194
  
    
                            conn.createStatement().execute(sql);


  		




  182
  195
  
    
                        } catch(SQLException ex) {


  		












Also available in:  Unified diff