equal
deleted
inserted
replaced
156 FormatterDefinition fd = configuration.getFormatter(options.getFormatterName()); |
156 FormatterDefinition fd = configuration.getFormatter(options.getFormatterName()); |
157 ConnectionManagement jmxBean = ManagementUtils.registerMBean(dd.getName()); |
157 ConnectionManagement jmxBean = ManagementUtils.registerMBean(dd.getName()); |
158 |
158 |
159 try (DatabaseConnection c = dd.connect(options.getDatabaseProperties(), jmxBean)) { |
159 try (DatabaseConnection c = dd.connect(options.getDatabaseProperties(), jmxBean)) { |
160 log.log(Level.FINE, "Database connected"); |
160 log.log(Level.FINE, "Database connected"); |
161 try (Formatter f = fd.getInstance(new FormatterContext(options.getOutputStream(), options.getFormatterProperties()))) { |
161 try (Formatter f = fd.getInstance(new FormatterContext(options.getOutputStream(), options.getFormatterProperties(), options.getRelationNames()))) { |
162 c.executeQuery(options.getSQLCommand(), f); |
162 c.executeQuery(options.getSQLCommand(), f); |
163 } |
163 } |
164 } |
164 } |
165 } |
165 } |
166 |
166 |
178 FormatterDefinition fd = configuration.getFormatter(options.getFormatterName()); |
178 FormatterDefinition fd = configuration.getFormatter(options.getFormatterName()); |
179 ConnectionManagement jmxBean = ManagementUtils.registerMBean(dd.getName()); |
179 ConnectionManagement jmxBean = ManagementUtils.registerMBean(dd.getName()); |
180 |
180 |
181 try (DatabaseConnection c = dd.connect(options.getDatabaseProperties(), jmxBean)) { |
181 try (DatabaseConnection c = dd.connect(options.getDatabaseProperties(), jmxBean)) { |
182 log.log(Level.FINE, "Database connected"); |
182 log.log(Level.FINE, "Database connected"); |
183 try (Formatter f = fd.getInstance(new FormatterContext(options.getOutputStream(), options.getFormatterProperties()))) { |
183 try (Formatter f = fd.getInstance(new FormatterContext(options.getOutputStream(), options.getFormatterProperties(), options.getRelationNames()))) { |
184 c.executeBatch(b, f); |
184 c.executeBatch(b, f); |
185 } |
185 } |
186 } |
186 } |
187 } |
187 } |
188 |
188 |