← Back to branch summary

~maria-captains/mariadb-java-client/trunk

« back to all changes in this revision

Viewing changes to src/main/java/org/mariadb/jdbc/MySQLConnection.java

  • Committer: Vladislav Vaintroub
  • Date: 2013-02-02 12:35:04 UTC
  • Revision ID: wlad@montyprogram.com-20130202123504-i0oociz534qp0xk0
https://mariadb.atlassian.net/browse/CONJ-16
CONJ-16 : Introduced nullCatalogMeansCurrent parameter, compatibly to ConnectorJ.

There are applications that depend on ConnectorJ default behavior, even if this behavior deviates from standard.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/main/java/org/mariadb/jdbc/MySQLConnection.java
88
88
 
89
89
    private boolean warningsCleared;
90
90
    boolean noBackslashEscapes;
 
91
    boolean nullCatalogMeansCurrent = true;
91
92
 
92
93
 
93
94
    /**
113
114
        String sessionVariables = protocol.getInfo().getProperty("sessionVariables");
114
115
        
115
116
        if (fastConnect && (sessionVariables == null))
116
 
                return connection;
 
117
            return connection;
117
118
        
118
119
        Statement st = null;
119
120
        try {
120
 
                st = connection.createStatement();                      
121
 
                if (sessionVariables != null) {
122
 
                  st.executeUpdate("set session " + sessionVariables);
123
 
                }
124
 
                if (!fastConnect) {
125
 
                        ResultSet rs = st.executeQuery("select @@sql_mode");
126
 
                        rs.next();
127
 
                        String sqlMode = rs.getString(1);
128
 
                        if (sqlMode.contains("NO_BACKSLASH_ESCAPES")) {
129
 
                                connection.noBackslashEscapes = true;
130
 
                        }
131
 
                }
 
121
                st = connection.createStatement();                      
 
122
                if (sessionVariables != null) {
 
123
                    st.executeUpdate("set session " + sessionVariables);
 
124
                }
 
125
                if (!fastConnect) {
 
126
                    ResultSet rs = st.executeQuery("select @@sql_mode");
 
127
                    rs.next();
 
128
                    String sqlMode = rs.getString(1);
 
129
                    if (sqlMode.contains("NO_BACKSLASH_ESCAPES")) {
 
130
                        connection.noBackslashEscapes = true;
 
131
                    }
 
132
                }
 
133
                String nullCatalogMeansCurrentString = protocol.getInfo().getProperty("nullCatalogMeansCurrent");
 
134
                if (nullCatalogMeansCurrentString != null && nullCatalogMeansCurrentString.equals("false")) {
 
135
                    connection.nullCatalogMeansCurrent = false;
 
136
                }
 
137
                
132
138
        } finally {
133
139
            if (st != null)
134
140
                st.close();