Revision 46088 trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.impl/src/main/java/org/gvsig/expressionevaluator/impl/grammars/DataAccessGrammarFactory.java

View differences:

DataAccessGrammarFactory.java
114 114 
            args.add(columns);
115 115 

  		




  116
  116
  
    
            Code table = context.getCode("TABLE");


  		




  117
  
  
    
            args.add(codeBuilder.identifier((String) ((Code.Constant) table).value()));


  		




  
  117
  
    
            args.add(table);


  		




  118
  118
  
    

  		




  119
  119
  
    
            Code where = context.getCode("WHERE");


  		




  120
  120
  
    
            if (where == null) {


  		




  ......




  207
  207
  
    
            Code table = context.getCode("table");


  		




  208
  208
  
    
            Code where = context.getCode("where");


  		




  209
  209
  
    

  		




  210
  
  
    
            args.add(codeBuilder.identifier((String) ((Code.Constant) table).value()));


  		




  
  210
  
    
            args.add(table);


  		




  211
  211
  
    

  		




  212
  212
  
    
            if (where == null) {


  		




  213
  213
  
    
                args.add(codeBuilder.constant(null));


  		




  ......




  337
  337
  
    
                .addRuleOnFalse(stmt.require_identifiers(",").capture_as("COLUMNS"))


  		




  338
  338
  
    
        );


  		




  339
  339
  
    
        stmt.addRule(stmt.require_any_token("FROM"));


  		




  340
  
  
    
        stmt.addRule(stmt.require_identifier().capture_as("TABLE"));


  		




  
  340
  
    
        stmt.addRule(stmt.require_expression().capture_as("TABLE"));


  		




  341
  341
  
    
        stmt.addRule(stmt.optional_any_token("WHERE")


  		




  342
  342
  
    
                .addRuleOnTrue(stmt.require_expression().capture_as("WHERE"))


  		




  343
  343
  
    
        );


  		




  ......




  368
  368
  
    
        return stmt;


  		




  369
  369
  
    
    }


  		




  370
  370
  
    

  		




  
  371
  
    

  		




  371
  372
  
    
    private Statement createInsertIntoTableSelectStatement(Grammar theGrammar) {


  		




  372
  373
  
    
        Statement stmt;


  		




  373
  374
  
    
//


  		




  ......




  448
  449
  
    
        stmt.addRule(stmt.require_any_token("*"));


  		




  449
  450
  
    
        stmt.addRule(stmt.require_any_token(")"));


  		




  450
  451
  
    
        stmt.addRule(stmt.require_any_token("FROM"));


  		




  451
  
  
    
        stmt.addRule(stmt.require_identifier().capture_as("TABLE"));


  		




  
  452
  
    
        stmt.addRule(stmt.require_expression().capture_as("TABLE"));


  		




  452
  453
  
    
        stmt.addRule(stmt.optional_any_token("WHERE")


  		




  453
  454
  
    
                .addRuleOnTrue(stmt.require_expression().capture_as("WHERE"))


  		




  454
  455
  
    
        );


  		












Also available in:  Unified diff