Index: openacs-4/packages/schema-browser/tcl/schema-browser-procs-oracle.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/schema-browser/tcl/schema-browser-procs-oracle.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/schema-browser/tcl/schema-browser-procs-oracle.tcl 16 May 2018 20:37:07 -0000 1.8
+++ openacs-4/packages/schema-browser/tcl/schema-browser-procs-oracle.tcl 5 Feb 2021 18:55:50 -0000 1.9
@@ -193,10 +193,10 @@
i.index_name,
c.column_position" {
- if { $uniqueness == "NONUNIQUE" } {
+ if { $uniqueness eq "NONUNIQUE" } {
# unique indices are written out as constraints
if { $index_name != $prev_index } {
- if { $prev_index != "" } {
+ if { $prev_index ne "" } {
append return_string ");"
}
append return_string "\nCREATE INDEX [string tolower $index_name] ON [string tolower $table_name]\("
@@ -208,7 +208,7 @@
}
}
- if { $prev_index != "" } {
+ if { $prev_index ne "" } {
append return_string ");"
}
@@ -297,7 +297,7 @@
" {
if { $constraint_name != [ns_set get $constraint_info "constraint_name"] } {
- if { [ns_set get $constraint_info "constraint_name"] != "" } {
+ if { [ns_set get $constraint_info "constraint_name"] ne "" } {
# we've reached a new constraint, so finish processing the old one
if { [llength [ns_set get $constraint_info "constraint_columns"]] > 1 } {
# this is a table constraint -- involves more than one column, so add it to the table constraint list
@@ -320,7 +320,7 @@
set constraint_columns [ns_set get $constraint_info "constraint_columns"]
lappend constraint_columns $column_name
ns_set update $constraint_info "constraint_columns" $constraint_columns
- if { $foreign_column_name != "" } {
+ if { $foreign_column_name ne "" } {
set foreign_columns [ns_set get $constraint_info "foreign_columns"]
lappend foreign_columns $foreign_column_name
ns_set put $constraint_info "constraint_columns" $foreign_columns
@@ -329,7 +329,7 @@
}
# we've run out of rows, but need to flush out the open current_constraint
- if { [ns_set get $constraint_info "constraint_name"] != "" } {
+ if { [ns_set get $constraint_info "constraint_name"] ne "" } {
if { [llength [ns_set get $constraint_info "constraint_columns"]] > 1 } {
lappend table_constraint_list $constraint_info
} else {
@@ -349,39 +349,39 @@
append html ","
# flush out a comment on the previous column, if needed
# delayed until after the comma
- if { $hanging_comment != "" } {
+ if { $hanging_comment ne "" } {
append html " -- $hanging_comment"
set hanging_comment ""
}
}
append html "\n"
set column_comments [ns_set get $column "column_comments"]
- if {$column_comments != ""} {
+ if {$column_comments ne ""} {
if { [string length $column_comments] > 40 } {
append html "\t-- [string range $column_comments 0 36]..."
} else {
append html "\t-- $column_comments"
}
}
append html "\t[string tolower [ns_set get $column "column_name"]]\t [ns_set get $column "data_type"]([ns_set get $column "data_length"])"
- if { [ns_set get $column "data_default"] != "" } {
+ if { [ns_set get $column "data_default"] ne "" } {
append html " DEFAULT [ad_text_to_html -- [ns_set get $column data_default]]"
}
- if { [ns_set get $column "nullable"] != "" } {
+ if { [ns_set get $column "nullable"] ne "" } {
append html " [ns_set get $column nullable]"
}
set constraint_list [ns_set get $column "constraint_list"]
foreach constraint $constraint_list {
set constraint_type [ns_set get $constraint "constraint_type"]
- if { $constraint_type == "P" } {
+ if { $constraint_type eq "P" } {
append html " PRIMARY KEY"
- } elseif { $constraint_type == "U" } {
+ } elseif { $constraint_type eq "U" } {
append html " UNIQUE"
- } elseif { $constraint_type == "R" } {
+ } elseif { $constraint_type eq "R" } {
set foreign_table [string tolower [ns_set get $constraint "foreign_table"]]
append html " REFERENCES <a href=\"index?table_name=$foreign_table\">$foreign_table</a>([string tolower [ns_set get $constraint "foreign_columns"]])"
set hanging_comment [ns_set get $constraint "constraint_name"]
- } elseif { $constraint_type == "C" } {
+ } elseif { $constraint_type eq "C" } {
# check constraint ignore not-null checks
# because we already handled them
if { [string first "NOT NULL" [ns_set get $constraint "search_condition"]] == -1 } {
@@ -391,7 +391,7 @@
}
incr n_column
}
- if { $hanging_comment != "" } {
+ if { $hanging_comment ne "" } {
append html " -- $hanging_comment"
set hanging_comment ""
}
@@ -406,13 +406,13 @@
set constraint_columns [ns_set get $constraint "constraint_columns"]
set foreign_table [string tolower [ns_set get $constraint "foreign_table"]]
set foreign_columns [ns_set get $constraint "foreign_columns"]
- if { $constraint_type == "P" } {
+ if { $constraint_type eq "P" } {
append html ",\n\tPRIMARY KEY [ns_set get $constraint "constraint_name"]("
append html "[string tolower [join [ns_set get $constraint "constraint_columns"] ","]])"
- } elseif { $constraint_type == "U"} {
+ } elseif { $constraint_type eq "U"} {
append html ",\n\tUNIQUE [ns_set get $constraint "constraint_name"]("
append html "[string tolower [join [ns_set get $constraint "constraint_columns"] ","]])"
- } elseif { $constraint_type == "R"} {
+ } elseif { $constraint_type eq "R"} {
append html ",\n\tFOREIGN KEY $constraint_name ("
append html "[string tolower [join $constraint_columns ","]])"
append html " REFERENCES <a href=\"index?table_name=$foreign_table\">[string tolower $foreign_table]</a>("
Index: openacs-4/packages/schema-browser/tcl/schema-browser-procs-postgresql.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/schema-browser/tcl/schema-browser-procs-postgresql.tcl,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/schema-browser/tcl/schema-browser-procs-postgresql.tcl 5 Feb 2021 17:18:50 -0000 1.17
+++ openacs-4/packages/schema-browser/tcl/schema-browser-procs-postgresql.tcl 5 Feb 2021 18:55:50 -0000 1.18
@@ -183,7 +183,7 @@
ad_proc sb_get_foreign_keys { table_name } {
Build a list describing all foreign keys on table_name and their actions.
- We ignore MATCH conditions because Oracle doesn't support them, therefore
+ We ignore MATCH conditions because Oracle doesn't support them, therefore,
OpenACS doesn't use them. Same is true of SET NULL and SET DEFAULT actions
hung on ON DELETE/ON UPDATE subclauses, but since Oracle *does* support
CASCADE as an action I had figure out how to grab this info from the system
@@ -255,7 +255,7 @@
while { $constraint_args ne "" } {
set arg_end [expr {[string first "\\000" $constraint_args] - 1}]
lappend one_ri_datum [string range $constraint_args $arg_start $arg_end]
- set constraint_args [string range $constraint_args [expr {$arg_end+5}] end]
+ set constraint_args [string range $constraint_args $arg_end+5 end]
}
switch $trigger_kind {
CHECK {
@@ -441,7 +441,7 @@
append html ","
}
set column_comments [ns_set get $column "column_comments"]
- if {$column_comments != ""} {
+ if {$column_comments ne ""} {
set comment_list [split $column_comments "\n"]
append html "\n\t--[join $comment_list "\n\t-- "]"
}
@@ -456,10 +456,10 @@
if { [llength $primary_key_columns] == 1 && [lindex $primary_key_columns 0] == [ns_set get $column column_number] } {
append html " PRIMARY KEY"
}
- if { [ns_set get $column "data_default"] != "" } {
+ if { [ns_set get $column "data_default"] ne "" } {
append html " DEFAULT [ad_text_to_html -- [ns_set get $column data_default]]"
}
- if { [ns_set get $column "nullable"] != "" } {
+ if { [ns_set get $column "nullable"] ne "" } {
append html " [ns_set get $column nullable]"
}
Index: openacs-4/packages/schema-browser/www/column-comments-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/schema-browser/www/column-comments-2.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/schema-browser/www/column-comments-2.tcl 27 Jun 2015 20:15:22 -0000 1.5
+++ openacs-4/packages/schema-browser/www/column-comments-2.tcl 5 Feb 2021 18:55:50 -0000 1.6
@@ -14,13 +14,13 @@
comments:notnull
} -validate {
valid_table_name -requires {table_name} {
- if ![db_table_exists $table_name] {
+ if {![db_table_exists $table_name]} {
ad_complain "Called with an invalid table name"
}
}
valid_column_name -requires {column_name valid_table_name} {
- if ![db_column_exists $table_name $column_name] {
+ if {![db_column_exists $table_name $column_name]} {
ad_complain "Called with an invalid column name"
}
}
Index: openacs-4/packages/schema-browser/www/column-comments.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/schema-browser/www/column-comments.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/schema-browser/www/column-comments.tcl 20 Jan 2018 22:49:57 -0000 1.5
+++ openacs-4/packages/schema-browser/www/column-comments.tcl 5 Feb 2021 18:55:50 -0000 1.6
@@ -16,12 +16,12 @@
set error_count 0
set error_message ""
-if { ![info exists table_name] || $table_name == "" } {
+if { ![info exists table_name] || $table_name eq "" } {
incr error_count
append error_message "<li>variable table_name not found"
}
-if { ![info exists column_name] || $column_name == "" } {
+if { ![info exists column_name] || $column_name eq "" } {
incr error_count
append error_message "<li>variable column_name not found"
}