equal
deleted
inserted
replaced
68 } |
68 } |
69 break; |
69 break; |
70 case Tokens.NAME_PREFIX: |
70 case Tokens.NAME_PREFIX: |
71 options.setNamePrefix(fetchNext(args, ++i)); |
71 options.setNamePrefix(fetchNext(args, ++i)); |
72 break; |
72 break; |
|
73 case Tokens.NAME_SUFFIX: |
|
74 options.setNameSuffix(fetchNext(args, ++i)); |
|
75 break; |
73 case Tokens.DB: |
76 case Tokens.DB: |
74 options.setDatabaseName(fetchNext(args, ++i)); |
77 options.setDatabaseName(fetchNext(args, ++i)); |
75 break; |
78 break; |
76 case Tokens.SQL: |
79 case Tokens.SQL: |
77 options.setSql(fetchNext(args, ++i)); |
80 options.setSql(fetchNext(args, ++i)); |
81 break; |
84 break; |
82 case Tokens.DATA: // --data is the last option |
85 case Tokens.DATA: // --data is the last option |
83 for (i++; i < args.length; i++) { |
86 for (i++; i < args.length; i++) { |
84 arg = args[i]; |
87 arg = args[i]; |
85 |
88 |
86 if (arg.startsWith(options.getNamePrefix())) { // Named parameters: |
89 if (arg.startsWith(options.getNamePrefix()) && arg.endsWith(options.getNameSuffix())) { // Named parameters: |
87 String paramName = arg.substring(options.getNamePrefix().length()); |
90 String paramName = arg.substring(options.getNamePrefix().length()); |
88 String paramValue = fetchNext(args, ++i); |
91 String paramValue = fetchNext(args, ++i); |
89 options.addNamedParameter(new NamedParameter(paramName, paramValue, namedTypes.get(paramName))); |
92 options.addNamedParameter(new NamedParameter(paramName, paramValue, namedTypes.get(paramName))); |
90 } else { // Numbered parameters: |
93 } else { // Numbered parameters: |
91 Parameter parameter; |
94 Parameter parameter; |
152 public static final String DB = "--db"; |
155 public static final String DB = "--db"; |
153 public static final String SQL = "--sql"; |
156 public static final String SQL = "--sql"; |
154 public static final String BATCH = "--batch"; |
157 public static final String BATCH = "--batch"; |
155 public static final String DATA = "--data"; |
158 public static final String DATA = "--data"; |
156 public static final String NAME_PREFIX = "--name-prefix"; |
159 public static final String NAME_PREFIX = "--name-prefix"; |
|
160 public static final String NAME_SUFFIX = "--name-suffix"; |
157 public static final String TYPES = "--types"; |
161 public static final String TYPES = "--types"; |
158 public static final String FORMATTER = "--formatter"; |
162 public static final String FORMATTER = "--formatter"; |
159 public static final String INFO_HELP = "--help"; |
163 public static final String INFO_HELP = "--help"; |
160 public static final String INFO_VERSION = "--version"; |
164 public static final String INFO_VERSION = "--version"; |
161 public static final String INFO_LICENSE = "--license"; |
165 public static final String INFO_LICENSE = "--license"; |