ColumnBase.java (hsqldb-2.6.0) | : | ColumnBase.java (hsqldb-2.6.1) | ||
---|---|---|---|---|
skipping to change at line 33 | skipping to change at line 33 | |||
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | |||
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | |||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | |||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | |||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | |||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |||
*/ | */ | |||
package org.hsqldb; | package org.hsqldb; | |||
import org.hsqldb.HsqlNameManager.HsqlName; | ||||
import org.hsqldb.types.Type; | import org.hsqldb.types.Type; | |||
import java.util.Locale; | ||||
/** | /** | |||
* Base implementation of variables, columns of result or table.<p> | * Base implementation of variables, columns of result or table.<p> | |||
* | * | |||
* @author Fred Toussi (fredt@users dot sourceforge.net) | * @author Fred Toussi (fredt@users dot sourceforge.net) | |||
* @version 2.3.4 | * @version 2.6.1 | |||
* @since 1.9.0 | * @since 1.9.0 | |||
*/ | */ | |||
public class ColumnBase { | public class ColumnBase { | |||
private String name; | private String name; | |||
private String table; | private String table; | |||
private String schema; | private String schema; | |||
private String catalog; | private String catalog; | |||
boolean isWriteable; | boolean isWriteable; | |||
private boolean isSearchable; | private boolean isSearchable; | |||
protected byte parameterMode; | protected byte parameterMode; | |||
protected boolean isIdentity; | protected boolean isIdentity; | |||
protected byte nullability = SchemaObject.Nullability.NULLABLE; | protected byte nullability; | |||
protected Type dataType; | protected Type dataType; | |||
ColumnBase() {} | ColumnBase() { | |||
this.nullability = SchemaObject.Nullability.NULLABLE; | ||||
} | ||||
public ColumnBase(String catalog, String schema, String table, | public ColumnBase(String catalog, String schema, String table, | |||
String name) { | String name) { | |||
this.catalog = catalog; | this.catalog = catalog; | |||
this.schema = schema; | this.schema = schema; | |||
this.table = table; | this.table = table; | |||
this.name = name; | this.name = name; | |||
this.nullability = SchemaObject.Nullability.NULLABLE; | ||||
} | } | |||
public ColumnBase(String catalog, ColumnSchema other) { | public ColumnBase(HsqlName catalog, ColumnSchema other, boolean toLower) { | |||
this.catalog = catalog.name; | ||||
this.schema = other.getSchemaNameString(); | ||||
this.table = other.getTableNameString(); | ||||
this.name = other.getNameString(); | ||||
if (toLower) { | ||||
if (!catalog.isNameQuoted) { | ||||
this.catalog = catalog.name.toLowerCase(Locale.ENGLISH); | ||||
} | ||||
HsqlName name = other.getName(); | ||||
if (!name.isNameQuoted) { | ||||
this.name = name.name.toLowerCase(Locale.ENGLISH); | ||||
} | ||||
name = name.parent; | ||||
if (name != null && !name.isNameQuoted) { | ||||
this.table = name.name.toLowerCase(Locale.ENGLISH); | ||||
} | ||||
name = name.schema; | ||||
if (name != null && !name.isNameQuoted) { | ||||
this.schema = name.name.toLowerCase(Locale.ENGLISH); | ||||
} | ||||
} | ||||
this.catalog = catalog; | ||||
this.schema = other.getSchemaNameString(); | ||||
this.table = other.getTableNameString(); | ||||
this.name = other.getNameString(); | ||||
this.nullability = other.getNullability(); | this.nullability = other.getNullability(); | |||
this.isIdentity = other.isIdentity(); | this.isIdentity = other.isIdentity(); | |||
this.isSearchable = other.isSearchable(); | this.isSearchable = other.isSearchable(); | |||
this.isWriteable = other.isWriteable(); | this.isWriteable = other.isWriteable(); | |||
} | } | |||
public String getNameString() { | public String getNameString() { | |||
return name; | return name; | |||
} | } | |||
End of changes. 8 change blocks. | ||||
12 lines changed or deleted | 43 lines changed or added |