equal
deleted
inserted
replaced
29 import info.globalcode.sql.dk.configuration.FormatterDefinition; |
29 import info.globalcode.sql.dk.configuration.FormatterDefinition; |
30 import info.globalcode.sql.dk.configuration.NameIdentified; |
30 import info.globalcode.sql.dk.configuration.NameIdentified; |
31 import info.globalcode.sql.dk.formatting.Formatter; |
31 import info.globalcode.sql.dk.formatting.Formatter; |
32 import info.globalcode.sql.dk.formatting.FormatterContext; |
32 import info.globalcode.sql.dk.formatting.FormatterContext; |
33 import info.globalcode.sql.dk.formatting.FormatterException; |
33 import info.globalcode.sql.dk.formatting.FormatterException; |
|
34 import info.globalcode.sql.dk.jmx.ConnectionManagement; |
|
35 import info.globalcode.sql.dk.jmx.ManagementUtils; |
34 import java.io.File; |
36 import java.io.File; |
35 import java.io.FileNotFoundException; |
37 import java.io.FileNotFoundException; |
36 import java.io.IOException; |
38 import java.io.IOException; |
37 import java.io.PrintStream; |
39 import java.io.PrintStream; |
38 import java.io.PrintWriter; |
40 import java.io.PrintWriter; |
147 } |
149 } |
148 |
150 |
149 private void processQueryNow() throws ConfigurationException, SQLException, FormatterException { |
151 private void processQueryNow() throws ConfigurationException, SQLException, FormatterException { |
150 DatabaseDefinition dd = getConfiguration().getDatabase(options.getDatabaseName()); |
152 DatabaseDefinition dd = getConfiguration().getDatabase(options.getDatabaseName()); |
151 FormatterDefinition fd = configuration.getFormatter(options.getFormatterName()); |
153 FormatterDefinition fd = configuration.getFormatter(options.getFormatterName()); |
152 try (DatabaseConnection c = dd.connect(options.getDatabaseProperties())) { |
154 ConnectionManagement jmxBean = ManagementUtils.registerMBean(dd.getName()); |
|
155 |
|
156 try (DatabaseConnection c = dd.connect(options.getDatabaseProperties(), jmxBean)) { |
153 log.log(Level.FINE, "Database connected"); |
157 log.log(Level.FINE, "Database connected"); |
154 try (Formatter f = fd.getInstance(new FormatterContext(options.getOutputStream(), options.getFormatterProperties()))) { |
158 try (Formatter f = fd.getInstance(new FormatterContext(options.getOutputStream(), options.getFormatterProperties()))) { |
155 c.executeQuery(options.getSQLCommand(), f); |
159 c.executeQuery(options.getSQLCommand(), f); |
156 } |
160 } |
157 } |
161 } |
167 BatchDecoder dec = new BatchDecoder(); |
171 BatchDecoder dec = new BatchDecoder(); |
168 Batch b = dec.decode(options.getInputStream()); |
172 Batch b = dec.decode(options.getInputStream()); |
169 |
173 |
170 DatabaseDefinition dd = getConfiguration().getDatabase(options.getDatabaseName()); |
174 DatabaseDefinition dd = getConfiguration().getDatabase(options.getDatabaseName()); |
171 FormatterDefinition fd = configuration.getFormatter(options.getFormatterName()); |
175 FormatterDefinition fd = configuration.getFormatter(options.getFormatterName()); |
172 try (DatabaseConnection c = dd.connect(options.getDatabaseProperties())) { |
176 ConnectionManagement jmxBean = ManagementUtils.registerMBean(dd.getName()); |
|
177 |
|
178 try (DatabaseConnection c = dd.connect(options.getDatabaseProperties(), jmxBean)) { |
173 log.log(Level.FINE, "Database connected"); |
179 log.log(Level.FINE, "Database connected"); |
174 try (Formatter f = fd.getInstance(new FormatterContext(options.getOutputStream(), options.getFormatterProperties()))) { |
180 try (Formatter f = fd.getInstance(new FormatterContext(options.getOutputStream(), options.getFormatterProperties()))) { |
175 c.executeBatch(b, f); |
181 c.executeBatch(b, f); |
176 } |
182 } |
177 } |
183 } |