activerecord-jdbc-adapter 60.3-java → 61.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf04f9e685826e3b3223a05c1ba13840c9868daa925f753c5380dd9eaebbc9a3
-  data.tar.gz: 189f9fc33999fb44e515d3ccf808233f97b15da048b4dd0f94c362aca4255ba6
+  metadata.gz: c0f6e1df31960b2169ea7d6c7d664a5d44a3302e0382957842124a0ed1090488
+  data.tar.gz: 63a7540994c1ef969cb67702fdf0860ab17f47632b985b9d52f690a5e247ea51
 SHA512:
-  metadata.gz: 1d674426d577a2a382a0216500318fe0065a7e415a846a0d37df883d3f2919e8f3803e872255ba58bf3c7ac023826ed3ee02e35f306ee9970aa4140094583f88
-  data.tar.gz: 883526f8298928d7e60df7575cd173d7a0e447a7f8ff81172332313167feb8fbc63e077b86c3d4a81a7fafc174843f001b073eca8f9bc734d17cd92debc043f7
+  metadata.gz: e367ae078f402928bb460a0677e506282deb20c802ccb6d4fafe27fea61717ea64048b6ef4b77b1143da97b56efbe71373b80e2ea870f007a6bcbf394a7be637
+  data.tar.gz: fb746f2b1260275e7cb4a7fe6f20c7720f5f23525e5a9ea5ecc852dac7f2141f01d177419ef701b43960ea36c42cb476536f229e575551200d2a5c8cc532c6ab

data/.travis.yml

@@ -15,7 +15,7 @@ install:
 
 language: ruby
 rvm:
-  - jruby-9.2.7.0
+  - jruby-9.2.14.0
 jdk:
   - openjdk8
 
@@ -37,8 +37,8 @@ before_script:
     mysql -e "grant all privileges on activerecord_unittest.* to rails@localhost;" && \
     mysql -e "grant all privileges on activerecord_unittest2.* to rails@localhost;" && \
     mysql -e "grant all privileges on inexistent_activerecord_unittest.* to rails@localhost;" && \
-    mysql -e "CREATE DATABASE activerecord_unittest DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;" && \
-    mysql -e "CREATE DATABASE activerecord_unittest2 DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;" \
+    mysql -e "CREATE DATABASE activerecord_unittest DEFAULT CHARACTER SET utf8mb4;" && \
+    mysql -e "CREATE DATABASE activerecord_unittest2 DEFAULT CHARACTER SET utf8mb4;" \
     || true
   - |
     [ "$DB" == "postgresql" ] && [ "$TEST_PREFIX" == "rails:" ] && \
@@ -48,7 +48,7 @@ before_script:
 
 env:
   global:
-    - AR_VERSION="6-0-stable"
+    - AR_VERSION="master"
 matrix:
   allow_failures:
     - rvm: jruby-head
@@ -111,18 +111,18 @@ matrix:
       env: DB=mariadb PREPARED_STATEMENTS=true
 
     # Rails test-suite :
-    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="6-0-stable" # PS off by default
-    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="6-0-stable" PREPARED_STATEMENTS=true
-    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="6-0-stable" DRIVER=MariaDB
+    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="6-1-stable" # PS off by default
+    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="6-1-stable" PREPARED_STATEMENTS=true
+    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="6-1-stable" DRIVER=MariaDB
 
     - addons:
         postgresql: "10"
-      env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="6-0-stable" # PS on by default
+      env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="6-1-stable" # PS on by default
     - addons:
         postgresql: "10"
-      env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="6-0-stable" PREPARED_STATEMENTS=false
+      env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="6-1-stable" PREPARED_STATEMENTS=false
     - addons:
         postgresql: "9.4"
-      env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="6-0-stable" # PS on by default
+      env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="6-1-stable" # PS on by default
 
-    - env: DB=sqlite3    TEST_PREFIX="rails:" AR_VERSION="6-0-stable"
+    - env: DB=sqlite3    TEST_PREFIX="rails:" AR_VERSION="6-1-stable"

data/Gemfile

@@ -59,7 +59,7 @@ end
 
 group :rails do
   group :test do
-    gem 'minitest', '~> 5.11.3', require: nil
+    gem 'minitest', '~> 5.12.2', require: nil
     gem 'minitest-excludes', '~> 2.0.1', require: nil
     gem 'minitest-rg', require: nil
 

data/README.md

@@ -23,7 +23,8 @@ Versions are targeted at certain versions of Rails and live on their own branche
 | 50.x        | 5.0.x         | 50-stable | 9.1.x     | 7        |
 | 51.x        | 5.1.x         | 51-stable | 9.1.x     | 7        |
 | 52.x        | 5.2.x         | 52-stable | 9.1.x     | 7        |
-| 60.x        | 6.0.x         | master    | 9.2.7     | 8        |
+| 60.x        | 6.0.x         | 60-stable | 9.2.7     | 8        |
+| 61.x        | 6.1.x         | master    | 9.2.7     | 8        |
 
 Note that JRuby 9.1.x is end-of-life. We recommend Java 8 at a minimum for all
 versions.
@@ -116,8 +117,8 @@ Proceed as with Rails; specify `ActiveRecord` in your Bundle along with the
 chosen JDBC adapter(s), this time sample *Gemfile* for MySQL:
 
 ```ruby
-gem 'activerecord', '~> 5.0.6'
-gem 'activerecord-jdbcmysql-adapter', :platform => :jruby
+gem 'activerecord', '~> 6.0.3'
+gem 'activerecord-jdbcmysql-adapter', '~> 60.2', :platform => :jruby
 ```
 
 When you `require 'bundler/setup'` everything will be set up for you as expected.
@@ -126,13 +127,13 @@ When you `require 'bundler/setup'` everything will be set up for you as expected
 
 Install the needed gems with JRuby, for example:
 
-    gem install activerecord -v "~> 5.0.6"
-    gem install activerecord-jdbc-adapter --ignore-dependencies
+    gem install activerecord -v "~> 6.0.3"
+    gem install activerecord-jdbc-adapter -v "~> 60.2" --ignore-dependencies
 
 If you wish to use the adapter for a specific database, you can install it
 directly and the (jdbc-) driver gem (dependency) will be installed as well:
 
-    jruby -S gem install activerecord-jdbcmysql-adapter
+    jruby -S gem install activerecord-jdbcmysql-adapter -v "~> 60.2"
 
 Your program should include:
 
@@ -172,7 +173,7 @@ ask on the #JRuby IRC channel on http://freenode.net/ (try [web-chat][6]).
 This project was originally written by [Nick Sieger](http://github.com/nicksieger)
 and [Ola Bini](http://github.com/olabini) with lots of help from the JRuby community.
 Polished 3.x compatibility and 4.x support (for AR-JDBC >= 1.3.0) was managed by
-[Karol Bucek](http://github.com/kares) among others. Support for Rails 6 was
+[Karol Bucek](http://github.com/kares) among others. Support for Rails 6.0 and 6.1 was
 contributed by [shellyBits GmbH](https://shellybits.ch/)
 
 ## License

data/activerecord-jdbc-adapter.gemspec

@@ -41,7 +41,7 @@ Gem::Specification.new do |gem|
   gem.executables = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files = gem.files.grep(%r{^test/})
 
-  gem.add_dependency 'activerecord', '~> 6.0.0'
+  gem.add_dependency 'activerecord', '~> 6.1.0'
 
   #gem.add_development_dependency 'test-unit', '2.5.4'
   #gem.add_development_dependency 'test-unit-context', '>= 0.3.0'

data/lib/arel/visitors/postgresql_jdbc.rb

@@ -2,5 +2,5 @@ require 'arel/visitors/compat'
 
 class Arel::Visitors::PostgreSQL
   # AREL converts bind argument markers "?" to "$n" for PG, but JDBC wants "?".
-  remove_method :visit_Arel_Nodes_BindParam if ArJdbc::AR42
+  remove_method :bind_block
 end

data/lib/arjdbc/abstract/core.rb

@@ -56,6 +56,7 @@ module ArJdbc
         case exception
           when SystemExit, SignalException, NoMemoryError then exception
           when ActiveModel::RangeError, TypeError, RuntimeError then exception
+          when ActiveRecord::ConnectionNotEstablished then exception
           else super
         end
       end

data/lib/arjdbc/abstract/database_statements.rb

@@ -15,6 +15,7 @@ module ArJdbc
         end
 
         materialize_transactions
+        mark_transaction_written_if_write(sql)
 
         binds = convert_legacy_binds_to_attributes(binds) if binds.first.is_a?(Array)
 
@@ -35,6 +36,7 @@ module ArJdbc
         end
 
         materialize_transactions
+        mark_transaction_written_if_write(sql)
 
         binds = convert_legacy_binds_to_attributes(binds) if binds.first.is_a?(Array)
 
@@ -55,6 +57,7 @@ module ArJdbc
         end
 
         materialize_transactions
+        mark_transaction_written_if_write(sql)
 
         binds = convert_legacy_binds_to_attributes(binds) if binds.first.is_a?(Array)
 
@@ -72,6 +75,7 @@ module ArJdbc
         end
 
         materialize_transactions
+        mark_transaction_written_if_write(sql)
 
         log(sql, name) { @connection.execute(sql) }
       end

data/lib/arjdbc/abstract/transaction_support.rb

@@ -24,26 +24,26 @@ module ArJdbc
       # Starts a database transaction.
       # @override
       def begin_db_transaction
-        log('BEGIN TRANSACTION', nil) { @connection.begin }
+        log('BEGIN', 'TRANSACTION') { @connection.begin }
       end
 
       # Starts a database transaction.
       # @param isolation the transaction isolation to use
       def begin_isolated_db_transaction(isolation)
-        log("BEGIN ISOLATED TRANSACTION - #{isolation}", nil) { @connection.begin(isolation) }
+        log("BEGIN ISOLATED - #{isolation}", 'TRANSACTION') { @connection.begin(isolation) }
       end
 
       # Commits the current database transaction.
       # @override
       def commit_db_transaction
-        log('COMMIT TRANSACTION', nil) { @connection.commit }
+        log('COMMIT', 'TRANSACTION') { @connection.commit }
       end
 
       # Rolls back the current database transaction.
       # Called from 'rollback_db_transaction' in the AbstractAdapter
       # @override
       def exec_rollback_db_transaction
-        log('ROLLBACK TRANSACTION', nil) { @connection.rollback }
+        log('ROLLBACK', 'TRANSACTION') { @connection.rollback }
       end
 
       ########################## Savepoint Interface ############################
@@ -55,7 +55,7 @@ module ArJdbc
       # @since 1.3.0
       # @extension added optional name parameter
       def create_savepoint(name = current_savepoint_name)
-        log("SAVEPOINT #{name}", 'Savepoint') { @connection.create_savepoint(name) }
+        log("SAVEPOINT #{name}", 'TRANSACTION') { @connection.create_savepoint(name) }
       end
 
       # Transaction rollback to a given (previously created) save-point.
@@ -64,7 +64,7 @@ module ArJdbc
       # @param name the save-point name
       # @extension added optional name parameter
       def exec_rollback_to_savepoint(name = current_savepoint_name)
-        log("ROLLBACK TO SAVEPOINT #{name}", 'Savepoint') { @connection.rollback_savepoint(name) }
+        log("ROLLBACK TO SAVEPOINT #{name}", 'TRANSACTION') { @connection.rollback_savepoint(name) }
       end
 
       # Release a previously created save-point.
@@ -73,9 +73,22 @@ module ArJdbc
       # @param name the save-point name
       # @extension added optional name parameter
       def release_savepoint(name = current_savepoint_name)
-        log("RELEASE SAVEPOINT #{name}", 'Savepoint') { @connection.release_savepoint(name) }
+        log("RELEASE SAVEPOINT #{name}", 'TRANSACTION') { @connection.release_savepoint(name) }
       end
 
     end
   end
 end
+
+# patch to avoid the usage of WeakMap
+require 'active_record/connection_adapters/abstract/transaction'
+module ActiveRecord
+  module ConnectionAdapters
+    class Transaction
+      def add_record(record, ensure_finalize = true)
+        @records ||= []
+        @records << record
+      end
+    end
+  end
+end

data/lib/arjdbc/mysql/adapter.rb

@@ -33,10 +33,10 @@ module ActiveRecord
 
       include ArJdbc::MySQL
 
-      def initialize(connection, logger, connection_parameters, config)
-        super
+      def initialize(connection, logger, connection_options, config)
+        superclass_config = config.reverse_merge(prepared_statements: false)
+        super(connection, logger, connection_options, superclass_config)
 
-        @prepared_statements = false unless config.key?(:prepared_statements)
         # configure_connection taken care of at ArJdbc::Abstract::Core
       end
 
@@ -88,7 +88,7 @@ module ActiveRecord
 
       # from MySQL::DatabaseStatements
       READ_QUERY = ActiveRecord::ConnectionAdapters::AbstractAdapter.build_read_query_regexp(
-        :begin, :commit, :explain, :select, :set, :show, :release, :savepoint, :rollback, :describe, :desc
+        :desc, :describe, :set, :show, :use
       ) # :nodoc:
       private_constant :READ_QUERY
 
@@ -96,6 +96,15 @@ module ActiveRecord
         !READ_QUERY.match?(sql)
       end
 
+      def explain(arel, binds = [])
+        sql     = "EXPLAIN #{to_sql(arel, binds)}"
+        start   = Concurrent.monotonic_time
+        result  = exec_query(sql, "EXPLAIN", binds)
+        elapsed = Concurrent.monotonic_time - start
+
+        MySQL::ExplainPrettyPrinter.new.pp(result, elapsed)
+      end
+
       # Reloading the type map in abstract/statement_cache.rb blows up postgres
       def clear_cache!
         reload_type_map
@@ -179,7 +188,7 @@ module ActiveRecord
 
       # defined in MySQL::DatabaseStatements which is not included
       def default_insert_value(column)
-        Arel.sql("DEFAULT") unless column.auto_increment?
+        super unless column.auto_increment?
       end
 
       # FIXME: optimize insert_fixtures_set by using JDBC Statement.addBatch()/executeBatch()

data/lib/arjdbc/mysql/connection_methods.rb

@@ -68,6 +68,7 @@ ArJdbc::ConnectionMethods.module_eval do
         # with reconnect fail-over sets connection read-only (by default)
         # properties['failOverReadOnly'] ||= 'false'
       end
+      properties['noDatetimeStringSync'] = true unless properties.key?('noDatetimeStringSync')
     end
     if config[:sslkey] || sslcert = config[:sslcert] # || config[:use_ssl]
       properties['useSSL'] ||= true # supported by MariaDB as well
@@ -90,11 +91,12 @@ ArJdbc::ConnectionMethods.module_eval do
       properties['localSocket'] ||= socket if mariadb_driver
     end
 
+    # properties['useJDBCCompliantTimezoneShift'] ||= true
     # for the Connector/J 5.1 line this is true by default - but it requires some really nasty
     # quirks to get casted Time values extracted properly according for AR's default_timezone
     # - thus we're turning it off (should be off in newer driver versions >= 6 anyway)
     # + also MariaDB driver is compilant and we would need to branch out based on driver
-    properties['useLegacyDatetimeCode'] = false
+    properties['useLegacyDatetimeCode'] = false # disables the effect of 'useTimezone'
 
     jdbc_connection(config)
   end
@@ -102,6 +104,8 @@ ArJdbc::ConnectionMethods.module_eval do
   alias_method :mysql2_connection, :mysql_connection
 
   def mariadb_connection(config)
+    config = config.deep_dup
+
     config[:adapter_spec] ||= ::ArJdbc::MySQL
     config[:adapter_class] = ActiveRecord::ConnectionAdapters::Mysql2Adapter unless config.key?(:adapter_class)
 

data/lib/arjdbc/postgresql/adapter.rb

@@ -48,46 +48,6 @@ module ArJdbc
       ADAPTER_NAME
     end
 
-    def get_database_version # :nodoc:
-      begin
-        version = @connection.database_product
-        if match = version.match(/([\d\.]*\d).*?/)
-          version = match[1].split('.').map(&:to_i)
-          # PostgreSQL version representation does not have more than 4 digits
-          # From version 10 onwards, PG has changed its versioning policy to
-          # limit it to only 2 digits. i.e. in 10.x, 10 being the major
-          # version and x representing the patch release
-          # Refer to:
-          #   https://www.postgresql.org/support/versioning/
-          #   https://www.postgresql.org/docs/10/static/libpq-status.html -> PQserverVersion()
-          # for more info
-
-          if version.size >= 3
-            (version[0] * 100 + version[1]) * 100 + version[2]
-          elsif version.size == 2
-            if version[0] >= 10
-              version[0] * 100 * 100 + version[1]
-            else
-              (version[0] * 100 + version[1]) * 100
-            end
-          elsif version.size == 1
-            version[0] * 100 * 100
-          else
-            0
-          end
-        else
-          0
-        end
-      end
-    end
-
-    def check_version # :nodoc:
-      if database_version < 90300
-        raise "Your version of PostgreSQL (#{database_version}) is too old. Active Record supports PostgreSQL >= 9.3."
-      end
-    end
-
-
     def redshift?
       # SELECT version() :
       #  PostgreSQL 8.0.2 on i686-pc-linux-gnu, compiled by GCC gcc (GCC) 3.4.2 20041017 (Red Hat 3.4.2-6.fc3), Redshift 1.0.647
@@ -127,6 +87,9 @@ module ArJdbc
         execute("SET time zone '#{tz}'", 'SCHEMA')
       end unless redshift?
 
+      # Set interval output format to ISO 8601 for ease of parsing by ActiveSupport::Duration.parse
+      execute("SET intervalstyle = iso_8601", "SCHEMA")
+
       # SET statements from :variables config hash
       # http://www.postgresql.org/docs/8.3/static/sql-set.html
       (config[:variables] || {}).map do |k, v|
@@ -209,6 +172,10 @@ module ArJdbc
       true
     end
 
+    def supports_partitioned_indexes?
+      database_version >= 110_000
+    end
+
     def supports_partial_index?
       true
     end
@@ -225,6 +192,10 @@ module ArJdbc
       true
     end
 
+    def supports_check_constraints?
+      true
+    end
+
     def supports_validate_constraints?
       true
     end
@@ -288,7 +259,7 @@ module ArJdbc
       database_version >= 90300
     end
 
-    def supports_foreign_tables? # we don't really support this yet, its a reminder :)
+    def supports_foreign_tables?
       database_version >= 90300
     end
 
@@ -311,11 +282,6 @@ module ArJdbc
       true
     end
 
-    # From AR 5.1 postgres_adapter.rb
-    def default_index_type?(index) # :nodoc:
-      index.using == :btree || super
-    end
-
     def get_advisory_lock(lock_id) # :nodoc:
       unless lock_id.is_a?(Integer) && lock_id.bit_length <= 63
         raise(ArgumentError, "PostgreSQL requires advisory lock ids to be a signed 64 bit integer")
@@ -369,6 +335,65 @@ module ArJdbc
       @use_insert_returning
     end
 
+    def get_database_version # :nodoc:
+      begin
+        version = @connection.database_product
+        if match = version.match(/([\d\.]*\d).*?/)
+          version = match[1].split('.').map(&:to_i)
+          # PostgreSQL version representation does not have more than 4 digits
+          # From version 10 onwards, PG has changed its versioning policy to
+          # limit it to only 2 digits. i.e. in 10.x, 10 being the major
+          # version and x representing the patch release
+          # Refer to:
+          #   https://www.postgresql.org/support/versioning/
+          #   https://www.postgresql.org/docs/10/static/libpq-status.html -> PQserverVersion()
+          # for more info
+
+          if version.size >= 3
+            (version[0] * 100 + version[1]) * 100 + version[2]
+          elsif version.size == 2
+            if version[0] >= 10
+              version[0] * 100 * 100 + version[1]
+            else
+              (version[0] * 100 + version[1]) * 100
+            end
+          elsif version.size == 1
+            version[0] * 100 * 100
+          else
+            0
+          end
+        else
+          0
+        end
+      end
+    end
+
+    def default_index_type?(index) # :nodoc:
+      index.using == :btree || super
+    end
+
+    def build_insert_sql(insert) # :nodoc:
+      sql = +"INSERT #{insert.into} #{insert.values_list}"
+
+      if insert.skip_duplicates?
+        sql << " ON CONFLICT #{insert.conflict_target} DO NOTHING"
+      elsif insert.update_duplicates?
+        sql << " ON CONFLICT #{insert.conflict_target} DO UPDATE SET "
+        sql << insert.touch_model_timestamps_unless { |column| "#{insert.model.quoted_table_name}.#{column} IS NOT DISTINCT FROM excluded.#{column}" }
+        sql << insert.updatable_columns.map { |column| "#{column}=excluded.#{column}" }.join(",")
+      end
+
+      sql << " RETURNING #{insert.returning}" if insert.returning
+      sql
+    end
+
+    def check_version # :nodoc:
+      if database_version < 90300
+        raise "Your version of PostgreSQL (#{database_version}) is too old. Active Record supports PostgreSQL >= 9.3."
+      end
+    end
+
+
     def exec_insert(sql, name = nil, binds = [], pk = nil, sequence_name = nil)
       val = super
       if !use_insert_returning? && pk
@@ -384,11 +409,7 @@ module ArJdbc
     end
 
     def execute_batch(statements, name = nil)
-      if statements.is_a? Array
-        execute(combine_multi_statements(statements), name)
-      else
-        execute(statements, name)
-      end
+      execute(combine_multi_statements(statements), name)
     end
 
     def explain(arel, binds = [])
@@ -398,7 +419,7 @@ module ArJdbc
 
     # from ActiveRecord::ConnectionAdapters::PostgreSQL::DatabaseStatements
     READ_QUERY = ActiveRecord::ConnectionAdapters::AbstractAdapter.build_read_query_regexp(
-      :begin, :commit, :explain, :select, :set, :show, :release, :savepoint, :rollback, :with
+      :close, :declare, :fetch, :move, :set, :show
     ) # :nodoc:
     private_constant :READ_QUERY
 
@@ -434,27 +455,8 @@ module ArJdbc
       exec_query("SELECT currval('#{sequence_name}')", 'SQL')
     end
 
-    def build_insert_sql(insert) # :nodoc:
-      sql = +"INSERT #{insert.into} #{insert.values_list}"
-
-      if insert.skip_duplicates?
-        sql << " ON CONFLICT #{insert.conflict_target} DO NOTHING"
-      elsif insert.update_duplicates?
-        sql << " ON CONFLICT #{insert.conflict_target} DO UPDATE SET "
-        sql << insert.updatable_columns.map { |column| "#{column}=excluded.#{column}" }.join(",")
-      end
-
-      sql << " RETURNING #{insert.returning}" if insert.returning
-      sql
-    end
-
-    def build_truncate_statements(*table_names)
-      ["TRUNCATE TABLE #{table_names.flatten.map(&method(:quote_table_name)).join(", ")}"]
-    end
-
-    def truncate(table_name, name = nil)
-      ActiveRecord::Base.clear_query_caches_for_current_thread if @query_cache_enabled
-      execute("TRUNCATE TABLE #{quote_table_name(table_name)}", name)
+    def build_truncate_statements(table_names)
+      ["TRUNCATE TABLE #{table_names.map(&method(:quote_table_name)).join(", ")}"]
     end
 
     def all_schemas
@@ -541,6 +543,16 @@ module ArJdbc
 
     # Returns the list of a table's column names, data types, and default values.
     #
+    # The underlying query is roughly:
+    #  SELECT column.name, column.type, default.value, column.comment
+    #    FROM column LEFT JOIN default
+    #      ON column.table_id = default.table_id
+    #     AND column.num = default.column_num
+    #   WHERE column.table_id = get_table_id('table_name')
+    #     AND column.num > 0
+    #     AND NOT column.is_dropped
+    #   ORDER BY column.num
+    #
     # If the table name is not prefixed with a schema, the database will
     # take the first match from the schema search path.
     #